Fix configure failure when enabling NAS without X useflag enabled, closes bug #156708; fix build failure when enabling FLAC without OggFlac bug #156539.

Package-Manager: portage-2.1.2_rc4-r7

4 files changed, 45 insertions, 15 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index e20dcb5dc0cc..d57a3452fcd1 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.72 2007/01/05 20:10:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.73 2007/01/10 19:46:45 flameeyes Exp $
+
+  10 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/timidity++-2.13.2-flac.patch, timidity++-2.13.2-r3.ebuild:
+  Fix configure failure when enabling NAS without X useflag enabled, closes
+  bug #156708; fix build failure when enabling FLAC without OggFlac bug
+  #156539.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   timidity++-2.13.2.ebuild, timidity++-2.13.2-r2.ebuild:
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index aef612323f59..8aedce47275a 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -13,6 +13,10 @@ AUX init.d.timidity 457 RMD160 af1eb92172f06b02f6761e414ea88b6e40c446f4 SHA1 50c
 MD5 dbc4910aa5c6a5681dd4f121b5db63e8 files/init.d.timidity 457
 RMD160 af1eb92172f06b02f6761e414ea88b6e40c446f4 files/init.d.timidity 457
 SHA256 8882137a10d5e858fa3c20f91d439192dca0759f43702180085d3514a12a59fd files/init.d.timidity 457
+AUX timidity++-2.13.2-flac.patch 735 RMD160 65abbbc330b0ae486af3686cea8329a4f9a1b75c SHA1 53f4cbf7a343002a3f6508938ba3e24d1f4bf5f5 SHA256 5ae270f3bc0b74def45dde4b85d178c8ebfbef01752ef6b4ec2588ffda48bbca
+MD5 fbb9c52d90ff967d8b4ac08643ef7b1c files/timidity++-2.13.2-flac.patch 735
+RMD160 65abbbc330b0ae486af3686cea8329a4f9a1b75c files/timidity++-2.13.2-flac.patch 735
+SHA256 5ae270f3bc0b74def45dde4b85d178c8ebfbef01752ef6b4ec2588ffda48bbca files/timidity++-2.13.2-flac.patch 735
 AUX timidity++-2.13.2-gcc4.patch 1325 RMD160 31383eb4a1d0a839d60af8d635aeba02febc9bb5 SHA1 8d50618a2379c078b07e8d0fc59457855c16106c SHA256 20ca5deb95ccbb527c0212f4ad002a5a8df1a9c005e210494abe7bc240cef3ee
 MD5 0868926c5290817cacb9a1849bc043c2 files/timidity++-2.13.2-gcc4.patch 1325
 RMD160 31383eb4a1d0a839d60af8d635aeba02febc9bb5 files/timidity++-2.13.2-gcc4.patch 1325
@@ -35,18 +39,18 @@ EBUILD timidity++-2.13.2-r2.ebuild 4299 RMD160 cd64fd60ba0381012e632dd51db47473f
 MD5 b0e988be110482205a41cf418d4a2130 timidity++-2.13.2-r2.ebuild 4299
 RMD160 cd64fd60ba0381012e632dd51db47473f51c1e87 timidity++-2.13.2-r2.ebuild 4299
 SHA256 40824047b8e9ec8ecfe1298f300004d283ce2d8d1fbf9f38cf4a18667bce9ef0 timidity++-2.13.2-r2.ebuild 4299
-EBUILD timidity++-2.13.2-r3.ebuild 4132 RMD160 c5e0d7c133ad079ec1e9013ba9cf92745dbaf686 SHA1 4edf75e9cf5f861e481fe059dcf9da7ccaea0e56 SHA256 20cfda9cbfc5faf46389c2831effce656fc436ebb208caf00b969ea4e71c566b
-MD5 32ba8b379f23529ed7832f18ff2ca720 timidity++-2.13.2-r3.ebuild 4132
-RMD160 c5e0d7c133ad079ec1e9013ba9cf92745dbaf686 timidity++-2.13.2-r3.ebuild 4132
-SHA256 20cfda9cbfc5faf46389c2831effce656fc436ebb208caf00b969ea4e71c566b timidity++-2.13.2-r3.ebuild 4132
+EBUILD timidity++-2.13.2-r3.ebuild 4261 RMD160 099608981c75a811235663fb861fa3e3a2aa0e4e SHA1 a2a88dfe8c9853fa83a9ef93cc48806572fe089e SHA256 6bf689bbfebac62f58c75248915452849ef230e217f97bbfc58c478873012d61
+MD5 466f649b757cf39134438ca1b5485351 timidity++-2.13.2-r3.ebuild 4261
+RMD160 099608981c75a811235663fb861fa3e3a2aa0e4e timidity++-2.13.2-r3.ebuild 4261
+SHA256 6bf689bbfebac62f58c75248915452849ef230e217f97bbfc58c478873012d61 timidity++-2.13.2-r3.ebuild 4261
 EBUILD timidity++-2.13.2.ebuild 3794 RMD160 a9d8ac099975a5e3c4166aa1e715be029e0d2f69 SHA1 6b9fe2795bcd743ed31c327879f3656927ae7878 SHA256 0976977ea7486bdc188b9790b95865d59c2d1042dded376b29c7794408566489
 MD5 6cfede46ceb2b92e70353ffea3db0bf9 timidity++-2.13.2.ebuild 3794
 RMD160 a9d8ac099975a5e3c4166aa1e715be029e0d2f69 timidity++-2.13.2.ebuild 3794
 SHA256 0976977ea7486bdc188b9790b95865d59c2d1042dded376b29c7794408566489 timidity++-2.13.2.ebuild 3794
-MISC ChangeLog 11675 RMD160 961fc72bd29fa4c794760904b2f9a060b2c2a0fa SHA1 07b13580ae4d751b4dd42bbc2e0e9980ca4937aa SHA256 81b5dfe06ac06e0cb2c40b77e30317735dd62234eaf461d78a7bac76023adbcf
-MD5 24ea966d928d32f8731bd4df67c7f202 ChangeLog 11675
-RMD160 961fc72bd29fa4c794760904b2f9a060b2c2a0fa ChangeLog 11675
-SHA256 81b5dfe06ac06e0cb2c40b77e30317735dd62234eaf461d78a7bac76023adbcf ChangeLog 11675
+MISC ChangeLog 11956 RMD160 0ad839868c5bf6d166ef3043347c6e5136de180e SHA1 7758a68677f5114c9619269764ce58ccd6e6aadf SHA256 af2bb6c46c054e087f10b656cfea942792ade42d12c8e4eb7b6ec49771bd6fa6
+MD5 0ca6af474278bdd51480f2409c31af1f ChangeLog 11956
+RMD160 0ad839868c5bf6d166ef3043347c6e5136de180e ChangeLog 11956
+SHA256 af2bb6c46c054e087f10b656cfea942792ade42d12c8e4eb7b6ec49771bd6fa6 ChangeLog 11956
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -63,7 +67,7 @@ SHA256 98bad02a8730d1cd370c7b6f53cecc9bf9ddaa29625e93f228b7feefed147f82 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFnrEAAiZjviIA2XgRAkS3AJ9oLXvz3gc+YOEu8hpLJmFF9hFBpQCfdG4I
-INsfctF8Kn5Sgz4ZXAoz3sk=
-=Dufu
+iD8DBQFFpUKyAiZjviIA2XgRAhycAKCn8VXKaJXFoE5osoIWfEWNQTq9ngCeJ/Yb
+3Q2By8fdr6lwvD/83uWMIdE=
+=NrWx
 -----END PGP SIGNATURE-----
diff --git a/media-sound/timidity++/files/timidity++-2.13.2-flac.patch b/media-sound/timidity++/files/timidity++-2.13.2-flac.patch
new file mode 100644
index 000000000000..4674c5e1961e
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.13.2-flac.patch
@@ -0,0 +1,18 @@
+*** TiMidity++-2.13.2/timidity/flac_a.c	Sun May 23 07:35:44 2004
+--- TiMidity++-2.13.2/timidity/flac_a.c	Sat Dec 30 13:24:08 2006
+***************
+*** 813,819 ****
+      return;
+    }
+- 
+-   if (flac_options.isogg) {
+  #ifdef AU_OGGFLAC
+      if ((ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != OggFLAC__STREAM_ENCODER_OK) {
+        ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "OggFLAC stream encoder is invalid (%s)",
+--- 813,818 ----
+      return;
+    }
+  #ifdef AU_OGGFLAC
++   if (flac_options.isogg) {
+      if ((ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != OggFLAC__STREAM_ENCODER_OK) {
+        ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "OggFLAC stream encoder is invalid (%s)",
diff --git a/media-sound/timidity++/timidity++-2.13.2-r3.ebuild b/media-sound/timidity++/timidity++-2.13.2-r3.ebuild
index c9ea5828bc32..c21ba7736cce 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r3.ebuild,v 1.6 2006/12/06 03:37:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r3.ebuild,v 1.7 2007/01/10 19:46:45 flameeyes Exp $
 
 inherit eutils
 
@@ -45,6 +45,7 @@ src_unpack() {
 	epatch "${DISTDIR}/${P}-exiterror.patch"
 	epatch "${FILESDIR}/${P}-gtk26.patch"
 	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-flac.patch"
 
 	# fix header location of speex
 	sed -i -e "s:#include <speex:#include <speex/speex:g" configure* timidity/speex_a.c
@@ -67,7 +68,8 @@ src_compile() {
 
 	if use nas; then
 		audios="${audios},nas"
-		myconf="${myconf} --with-nas-library=/usr/$(get_libdir)/libaudio.so"
+		myconf="${myconf} --with-nas-library=/usr/$(get_libdir)/libaudio.so --with-x"
+		use X || ewarn "Basic X11 support will be enabled because required by nas."
 	fi
 
 	if use alsa; then