Adding patch to come around segfault on amd64. BUG #44070.

4 files changed, 35 insertions, 12 deletions

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index 1ad58511f44d..a90506f29aad 100644
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/nas
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.24 2004/06/24 23:17:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.25 2004/07/10 15:02:32 kugelfang Exp $
+
+  10 Jul 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/nas-1.6c-header.patch, nas-1.6c-r1.ebuild:
+  Added patch on amd64 to cure segfaults. BUG #44070
 
   19 Jun 2004; Tom Gall <tgall@gentoo.org> nas-1.6c-r1.ebuild:
   ~ppc64 bug #54449
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 12685626cf2a..50ac22845c5f 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,13 +1,14 @@
-MD5 af8c4ec9066a4de4e9fa29f7d2fab1be nas-1.5-r1.ebuild 1111
-MD5 002163cc6cfa0bf0a83c4f1c6d5e1607 nas-1.6.ebuild 1020
-MD5 b9aff286346536be0386a0fceadc7d0e nas-1.6c-r1.ebuild 1712
-MD5 06254a6267c4b35af8015ec56e156160 ChangeLog 3302
+MD5 de222f905161fe54e5eab13b19ab5927 ChangeLog 3461
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 002163cc6cfa0bf0a83c4f1c6d5e1607 nas-1.6.ebuild 1020
+MD5 d29c3d9ae8bbe352ef6c1c5e9c17ba31 nas-1.6c-r1.ebuild 1839
 MD5 13a61d04a20b645099bd84d72891bcd2 nas-1.6c.ebuild 1027
-MD5 f0200b3a05bd59ab92413ec1eee10a5b files/nas-1.5-libaudioMakefile.patch 300
-MD5 83023e52672dc59996f4f620563b072a files/nas.conf.d 235
-MD5 fc5b3121a14c4c3938620cd0f7afd800 files/nas.init.d 571
-MD5 ac506d33fb676e68c2a77d95d3f6027e files/digest-nas-1.5-r1 63
+MD5 af8c4ec9066a4de4e9fa29f7d2fab1be nas-1.5-r1.ebuild 1111
+MD5 410aefeb0f6a2d7a50d485282f9cac71 files/nas-1.6c-header.patch 313
+MD5 4a7327fe2c6fba8c4315133a522358a3 files/digest-nas-1.6 64
 MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c 65
 MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c-r1 65
-MD5 4a7327fe2c6fba8c4315133a522358a3 files/digest-nas-1.6 64
+MD5 83023e52672dc59996f4f620563b072a files/nas.conf.d 235
+MD5 e7719afac1d96eae6dbcd095d8161ef2 files/nas.init.d 572
+MD5 ac506d33fb676e68c2a77d95d3f6027e files/digest-nas-1.5-r1 63
+MD5 f0200b3a05bd59ab92413ec1eee10a5b files/nas-1.5-libaudioMakefile.patch 300
diff --git a/media-libs/nas/files/nas-1.6c-header.patch b/media-libs/nas/files/nas-1.6c-header.patch
new file mode 100644
index 000000000000..1e94821a438e
--- /dev/null
+++ b/media-libs/nas/files/nas-1.6c-header.patch
@@ -0,0 +1,10 @@
+--- server/dia/main.c.orig	2004-07-10 16:26:02.392580536 +0200
++++ server/dia/main.c	2004-07-10 16:26:18.304161608 +0200
+@@ -51,6 +51,7 @@
+  * $Id: nas-1.6c-header.patch,v 1.1 2004/07/10 15:02:32 kugelfang Exp $
+  */
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <audio/audio.h>
+ #include <audio/Aproto.h>
diff --git a/media-libs/nas/nas-1.6c-r1.ebuild b/media-libs/nas/nas-1.6c-r1.ebuild
index f66443c54656..28ead94399df 100644
--- a/media-libs/nas/nas-1.6c-r1.ebuild
+++ b/media-libs/nas/nas-1.6c-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.6c-r1.ebuild,v 1.8 2004/06/24 23:17:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.6c-r1.ebuild,v 1.9 2004/07/10 15:02:32 kugelfang Exp $
+
+inherit eutils
 
 DESCRIPTION="Network Audio System"
 SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
@@ -20,10 +22,16 @@ RDEPEND="virtual/x11"
 DEPEND="${RDEPEND}
 	sys-apps/sed"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use amd64 && epatch ${FILESDIR}/${P}-header.patch
+}
+
 src_compile() {
 	xmkmf
 	touch doc/man/lib/tmp.{_man,man}
-	emake World || die
+	CFLAGS="-O2 -ggdb" emake World || die
 }
 
 src_install () {