fix build without libvorbis and use=-vorbis, by tangram <tangram1@tlen.pl>, bug #233472

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 29 insertions, 7 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 976127fb8f27..05e39db2cf3a 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.101 2008/08/05 13:02:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.102 2008/08/07 17:19:02 aballier Exp $
+
+  07 Aug 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/audacity-1.3.5-novorbis.patch, audacity-1.3.5.ebuild:
+  fix build without libvorbis and use=-vorbis, by tangram
+  <tangram1@tlen.pl>, bug #233472
 
   05 Aug 2008; Alexis Ballier <aballier@gentoo.org> audacity-1.3.5.ebuild:
   Bump flac dep to force upgrade to a recent version, it would fail to build
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 0045077060eb..3dfeb724de62 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -6,18 +6,19 @@ AUX audacity-1.3.4-automagic.patch 2625 RMD160 63f28b895aa94c2458cc3f16ed52f3a44
 AUX audacity-1.3.4-nolibfailure.patch 1565 RMD160 7d09b05176eee4ac0bee6f6832e472728ba890dd SHA1 18ebf966afa3569f34da8af53605fc4cf51d833f SHA256 25fce83269210c1ce446b01969fd65e980ddcfd3b489218a3e9e3d16d4025e62
 AUX audacity-1.3.5-cflags_with_non_standard_macros.patch 1579 RMD160 a199800aacdf96b22e52654f9ed29325272771e9 SHA1 bbb3b6f33cecfd9b9bd64f137fca5e5154f699ba SHA256 63fb54b58de9a2523495a2eb7e62362450665fdaf5b6be85a3d3717fadf29385
 AUX audacity-1.3.5-libtool22.patch 621 RMD160 9c8b46928a8dd2d1750163570fa9a36abb44212a SHA1 c1fb708d251331670a881bb3196baf21bfc5bee7 SHA256 c8f25696de80da8f41224be44c630c288e7a94290bb0d86fef6709e0d1923f67
+AUX audacity-1.3.5-novorbis.patch 484 RMD160 cc6416c4ae82d557dc33291911b9826a13313881 SHA1 93c336118eb29eeb09175574f6ef37006f620869 SHA256 34045eb10d9f2d724c4f9c8ed8f33fc57354f73a10531713f9fdff40269f7cb1
 DIST audacity-1.3.4-portaudio-cvs-rev1.7.patch.bz2 6235 RMD160 38e74622e7af4cf3662e87256ec38373eeb00595 SHA1 0a19a1e38d7ee552d75583a6e99e892b3cf4ab50 SHA256 ad78193aee772eb78e5a315d721b0f35242eb6f9b5e8f7d9e718d8a11e70b8a1
 DIST audacity-src-1.3.4.tar.bz2 4349381 RMD160 754d81fb0e660d697e7c315c41f28584917e0a9e SHA1 50ab6cf19545f8cb38226b96252dbd958e7d88c4 SHA256 102d60e48e1928f3fd995a214ed9ba872929c6365cf5f784f107f351b42499f9
 DIST audacity-src-1.3.5.tar.bz2 4542637 RMD160 f4d56d8ad88ad743c9ae04ee4abc3ded61674c5e SHA1 6ff24769fdef7bb0db7702eecb128f242fc85fce SHA256 58beaf20d5d4bdec61c93cc9bda08faea9b1c9b51c962b4176e9390a6a65904c
 DIST pa_stable_v19_20071207.tar.gz 1113282 RMD160 5185bd85bd4bc75dddb3fa56f172a346bdeea0c7 SHA1 3841453bb7be672a15b6b632ade6f225eb0a4efc SHA256 06a17727d56d382a69036de2ed9aee9a15cac0329b995b8cfcd69b357f47bf2b
 EBUILD audacity-1.3.4-r3.ebuild 2954 RMD160 7d16f63e00fc0bc7d9155cdb77bcf5077a8893df SHA1 17c20c4ce1b6dc01148f5e3817421d41b6753fd3 SHA256 e6882880a70b72def3c0c8cccca19e752b49977a9be30a810b0d9b2282ff126a
-EBUILD audacity-1.3.5.ebuild 2729 RMD160 70c018554c0e66b601a9922407580ee394d43df2 SHA1 d2530c97bf431966a1337fa9d6d572be466111e6 SHA256 1b3e95111db1c679e507254e6a7723c2435fb5d19bc6e612212e1f704d199493
-MISC ChangeLog 17726 RMD160 93cc1f70a5cc2f6dac7c8a9febfac63ae58e7b19 SHA1 540fb1451e873393e8684035ecbadcea20e0a109 SHA256 19968e36d001fd20bfe64ce41b947d58321a9281254938fe2b89fc8969061d42
+EBUILD audacity-1.3.5.ebuild 2771 RMD160 b4af0212882aa568ee3e2f2881de15e9cc02ab1a SHA1 820f1960364b320b197e04dead9d548c8fb14fa1 SHA256 a9ee2109cf0782970a1895af9660b69479022170535cbf57a160905750318acf
+MISC ChangeLog 17934 RMD160 ac40c8cae0ae1a9bfcc5cfa340ed4f445a2b22e2 SHA1 f399437643add5162b87e13198faac3413b1d889 SHA256 827f5afe75704cd2fd566e41c7d4a4dfd0d8f7809b919e4c7313d7c7a4ec58b4
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiYT40ACgkQvFcC4BYPU0rFvQCePNwNfpQslUJQXf4mJyXf0x99
-YNYAoIxa6PFgTAtgDhu9cqQ7bkXzX8iQ
-=8n0r
+iEYEARECAAYFAkibLowACgkQvFcC4BYPU0rIGQCfe0YAYER1Dr4KqXoRXOgpTIqo
+qtoAn3WDjCWifzuqSeAm6wzcvmPDf+y4
+=Lc3N
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.5.ebuild b/media-sound/audacity/audacity-1.3.5.ebuild
index 1bbb8367f903..4959f8aaa592 100644
--- a/media-sound/audacity/audacity-1.3.5.ebuild
+++ b/media-sound/audacity/audacity-1.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.5.ebuild,v 1.5 2008/08/05 13:02:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.5.ebuild,v 1.6 2008/08/07 17:19:02 aballier Exp $
 
 inherit eutils wxwidgets autotools
 
@@ -64,6 +64,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.3.4-automagic.patch"
 	epatch "${FILESDIR}/${P}-cflags_with_non_standard_macros.patch"
 	epatch "${FILESDIR}/${P}-libtool22.patch"
+	epatch "${FILESDIR}/${P}-novorbis.patch"
 	eautoreconf
 }
 
diff --git a/media-sound/audacity/files/audacity-1.3.5-novorbis.patch b/media-sound/audacity/files/audacity-1.3.5-novorbis.patch
new file mode 100644
index 000000000000..9b499278d571
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.5-novorbis.patch
@@ -0,0 +1,15 @@
+Index: audacity-src-1.3.5-beta/src/export/ExportFLAC.cpp
+===================================================================
+--- audacity-src-1.3.5-beta.orig/src/export/ExportFLAC.cpp
++++ audacity-src-1.3.5-beta/src/export/ExportFLAC.cpp
+@@ -29,7 +29,10 @@ and libvorbis examples, Monty <monty@xip
+ #include <wx/log.h>
+ #include <wx/msgdlg.h>
+ 
++#ifdef USE_LIBVORBIS
+ #include <vorbis/vorbisenc.h>
++#endif // USE_LIBVORBIS
++
+ #include "FLAC++/encoder.h"
+ 
+ #include "../float_cast.h"