From: Alexis Ballier <aballier@gentoo.org>
Date: Mon, 11 Dec 2006 19:32:31 +0000 (+0000)
Subject: Patch from Josh Coalson to be compatible with flac 1.1.3, pinning dep to 1.1.2 for... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f77d6b424daa0a1fa0659b233df723b2008e76fc;p=gentoo.git

Patch from Josh Coalson to be compatible with flac 1.1.3, pinning dep to 1.1.2 for non patched version
Package-Manager: portage-2.1.2_rc3-r2
---

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 48b9242941ec..73df05db73ed 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.52 2006/11/16 16:49:50 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.53 2006/12/11 19:32:31 aballier Exp $
+
+  11 Dec 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/audacity-1.3.2+flac-1.1.3.patch, audacity-1.3.2.ebuild,
+  audacity-1.3.2-r1.ebuild:
+  Patch from Josh Coalson to be compatible with flac 1.1.3, pinning dep to
+  1.1.2 for non patched version
 
 *audacity-1.3.2-r1 (16 Nov 2006)
 
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index fd0f90d02d21..39521cef1203 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX audacity-1.2.3-gcc41.patch 650 RMD160 4fabdb072b9e4a6c9d908694cc2e7cea8e1ce16e SHA1 dd9f41c9f011a244062ea0c0c28188716f7165ca SHA256 c8acd7c59f69d6bf8fba8773e47cd6b3b4a4cbfbc510b0ac7aa2f3b88ea344fb
 MD5 8d8b48aa5931322a0a0a8ad826335c38 files/audacity-1.2.3-gcc41.patch 650
 RMD160 4fabdb072b9e4a6c9d908694cc2e7cea8e1ce16e files/audacity-1.2.3-gcc41.patch 650
@@ -6,6 +9,10 @@ AUX audacity-1.3.0b-x86.patch 1278 RMD160 3b9a2af0fc9c4c4b6287112cd035205c6eb508
 MD5 7824e4b13601ac393e05a72a195ef97b files/audacity-1.3.0b-x86.patch 1278
 RMD160 3b9a2af0fc9c4c4b6287112cd035205c6eb508c7 files/audacity-1.3.0b-x86.patch 1278
 SHA256 865b06b9089d5fc0af194268316aa09deba80fabb1e058708d13e47f364e5dea files/audacity-1.3.0b-x86.patch 1278
+AUX audacity-1.3.2+flac-1.1.3.patch 4143 RMD160 5e154be7cee78c206716509d71a8ed883066a114 SHA1 1e38825cb8ba0a5ffa74cd4086ca3a04aaa1264c SHA256 efce32ae9bc0085e2c058ddb4a2436547901bb22f5b2c9a4804dc5b088392eac
+MD5 9a8818667ff40745e903ead0821b6d68 files/audacity-1.3.2+flac-1.1.3.patch 4143
+RMD160 5e154be7cee78c206716509d71a8ed883066a114 files/audacity-1.3.2+flac-1.1.3.patch 4143
+SHA256 efce32ae9bc0085e2c058ddb4a2436547901bb22f5b2c9a4804dc5b088392eac files/audacity-1.3.2+flac-1.1.3.patch 4143
 AUX audacity-1.3.2-disable-optimization.patch 728 RMD160 263c163c26b26851e7ebb6967c8ee20f3346744a SHA1 e127caf717baab7ff184bae78d646bb93dcf8c43 SHA256 312feb7a326bbfb167673976122ddc3d1283e6fde7cd93ae248a6b9a93401246
 MD5 94db7bade2576db7f3154d3f3a0326e5 files/audacity-1.3.2-disable-optimization.patch 728
 RMD160 263c163c26b26851e7ebb6967c8ee20f3346744a files/audacity-1.3.2-disable-optimization.patch 728
@@ -24,18 +31,18 @@ EBUILD audacity-1.3.0b.ebuild 1590 RMD160 9db875326c079bbe354d57e356e80042a0e177
 MD5 3112308da3a84bb03bac837256f6d824 audacity-1.3.0b.ebuild 1590
 RMD160 9db875326c079bbe354d57e356e80042a0e177c1 audacity-1.3.0b.ebuild 1590
 SHA256 834dc0652f8d18e683738a2d06093a9f73120972e6d40aee9d6ab30c759ce0b0 audacity-1.3.0b.ebuild 1590
-EBUILD audacity-1.3.2-r1.ebuild 1990 RMD160 08a804ce841814a953860065f1ea0de4039dc3b1 SHA1 7b38231ab9bf3572f3dc94a64c740d4f7fb8f317 SHA256 93f311d2653a5796b5f6167188bcc6f97cc5233c453cd3bafa6ef841ff52d077
-MD5 baa8dc289307da7ae60597cc317ad96c audacity-1.3.2-r1.ebuild 1990
-RMD160 08a804ce841814a953860065f1ea0de4039dc3b1 audacity-1.3.2-r1.ebuild 1990
-SHA256 93f311d2653a5796b5f6167188bcc6f97cc5233c453cd3bafa6ef841ff52d077 audacity-1.3.2-r1.ebuild 1990
-EBUILD audacity-1.3.2.ebuild 1904 RMD160 a1b28b8eef1e91d2b2b92b2139f7f1da777e56a4 SHA1 5cb230b3b0c9b4e0ead71cf45edb50f27501496e SHA256 f2735965bcb6986a26d51171df34ff51e3df8b783b298143291f9a5be70abbfa
-MD5 92a7997a97b27486bfa8b8649647b6ed audacity-1.3.2.ebuild 1904
-RMD160 a1b28b8eef1e91d2b2b92b2139f7f1da777e56a4 audacity-1.3.2.ebuild 1904
-SHA256 f2735965bcb6986a26d51171df34ff51e3df8b783b298143291f9a5be70abbfa audacity-1.3.2.ebuild 1904
-MISC ChangeLog 9757 RMD160 86c4c0d259d338b65c84899f4beb61edd166eed3 SHA1 e4d6b2aaf4aa2095270b15e125d496831c081a3d SHA256 18f8993412cc20da719f59d8b31c14929eb40873b2f7f9f93dece1d2e143ae60
-MD5 ee24197f124ca8c30e69399ae5e6816e ChangeLog 9757
-RMD160 86c4c0d259d338b65c84899f4beb61edd166eed3 ChangeLog 9757
-SHA256 18f8993412cc20da719f59d8b31c14929eb40873b2f7f9f93dece1d2e143ae60 ChangeLog 9757
+EBUILD audacity-1.3.2-r1.ebuild 2036 RMD160 017876c356dbd6429a73a5af7a7a8ca5002777ad SHA1 513e070e068d9bdf167b24bd69095d99c4847547 SHA256 fede59f7e273f63aab3bd7aa553df83778f6fdf316f756aeee7bfef6c58c9cba
+MD5 316498683c8f0add7af2542ee988e426 audacity-1.3.2-r1.ebuild 2036
+RMD160 017876c356dbd6429a73a5af7a7a8ca5002777ad audacity-1.3.2-r1.ebuild 2036
+SHA256 fede59f7e273f63aab3bd7aa553df83778f6fdf316f756aeee7bfef6c58c9cba audacity-1.3.2-r1.ebuild 2036
+EBUILD audacity-1.3.2.ebuild 1910 RMD160 82c2764251d6fc7b97ff5577c8af9368758e50e7 SHA1 295a9eb806f8aa483167f90581e8ea33f68f7f60 SHA256 ebca97ffad6c594b6a0a3a52e7c1801945c7c21fdf9ce7ccd6850fe3b08cb3c5
+MD5 1d1717d89ca8c983c1fe31921e4551a1 audacity-1.3.2.ebuild 1910
+RMD160 82c2764251d6fc7b97ff5577c8af9368758e50e7 audacity-1.3.2.ebuild 1910
+SHA256 ebca97ffad6c594b6a0a3a52e7c1801945c7c21fdf9ce7ccd6850fe3b08cb3c5 audacity-1.3.2.ebuild 1910
+MISC ChangeLog 10012 RMD160 0597238505fc1cca50395429637d2e45f9fd3a72 SHA1 3cc7e8a26f5f1d15ec075f4ac565b60f9e583c4e SHA256 fd44fe644639f1cf7f5c7e3c72466ff325486027125e71d2ae994c5506a1a5c9
+MD5 d6c3317189b788cc0aeb4a2fc581ec6b ChangeLog 10012
+RMD160 0597238505fc1cca50395429637d2e45f9fd3a72 ChangeLog 10012
+SHA256 fd44fe644639f1cf7f5c7e3c72466ff325486027125e71d2ae994c5506a1a5c9 ChangeLog 10012
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -49,3 +56,10 @@ SHA256 707a1fdb467f1d843eb4978eac90c42d2a428918549578c186d6c568808aaaa5 files/di
 MD5 e4cb0c698f065ef88bab1eba174707aa files/digest-audacity-1.3.2-r1 259
 RMD160 8c96101c6f992bb514996875537ada9adde0edab files/digest-audacity-1.3.2-r1 259
 SHA256 707a1fdb467f1d843eb4978eac90c42d2a428918549578c186d6c568808aaaa5 files/digest-audacity-1.3.2-r1 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFfbI7vFcC4BYPU0oRAmneAJsEFpodWdG50ie8VHoRJTqCU/wMtgCeMmST
+u6n+N2UWvAfQbOzsWW2Ynf4=
+=IXDp
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.2-r1.ebuild b/media-sound/audacity/audacity-1.3.2-r1.ebuild
index e3d35af64924..857e965a52c7 100644
--- a/media-sound/audacity/audacity-1.3.2-r1.ebuild
+++ b/media-sound/audacity/audacity-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.2-r1.ebuild,v 1.1 2006/11/16 16:49:50 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.2-r1.ebuild,v 1.2 2006/12/11 19:32:31 aballier Exp $
 
 inherit eutils autotools
 
@@ -39,6 +39,7 @@ src_unpack() {
 		epatch "${FILESDIR}"/${P}-no-msse.patch
 		epatch "${FILESDIR}"/${P}-disable-optimization.patch
 	fi
+	epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
 
 	eautoreconf || die
 	pushd "${S}"/lib-src/soundtouch
diff --git a/media-sound/audacity/audacity-1.3.2.ebuild b/media-sound/audacity/audacity-1.3.2.ebuild
index f71646f614e6..f96e63e23d11 100644
--- a/media-sound/audacity/audacity-1.3.2.ebuild
+++ b/media-sound/audacity/audacity-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.2.ebuild,v 1.3 2006/11/10 16:36:18 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.2.ebuild,v 1.4 2006/12/11 19:32:31 aballier Exp $
 
 inherit eutils autotools
 
@@ -22,7 +22,7 @@ DEPEND=">=x11-libs/wxGTK-2.6
 	vorbis? ( >=media-libs/libvorbis-1.0 )
 	mp3? ( >=media-libs/libmad-0.14.2b
 		media-libs/libid3tag )
-	flac? ( media-libs/flac )
+	flac? ( ~media-libs/flac-1.1.2 )
 	>=media-libs/libsndfile-1.0.0
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )"
 RDEPEND="${DEPEND}
diff --git a/media-sound/audacity/files/audacity-1.3.2+flac-1.1.3.patch b/media-sound/audacity/files/audacity-1.3.2+flac-1.1.3.patch
new file mode 100644
index 000000000000..e00cc6d7cee5
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.2+flac-1.1.3.patch
@@ -0,0 +1,138 @@
+? src/export/2
+? src/export/makefile
+? src/import/2
+? src/import/makefile
+Index: acinclude.m4
+===================================================================
+RCS file: /cvsroot/audacity/audacity-src/acinclude.m4,v
+retrieving revision 1.17
+diff -u -r1.17 acinclude.m4
+--- acinclude.m4	20 Oct 2006 10:31:59 -0000	1.17
++++ acinclude.m4	20 Oct 2006 22:46:26 -0000
+@@ -463,7 +463,7 @@
+    dnl See if FLAC is installed in the system
+ 
+    AC_CHECK_LIB(FLAC,
+-                FLAC__file_decoder_new,
++                FLAC__stream_decoder_new,
+                 lib_found="yes",
+                 lib_found="no",
+                 -lFLAC++ -lFLAC)
+Index: src/export/ExportFLAC.cpp
+===================================================================
+RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFLAC.cpp,v
+retrieving revision 1.9
+diff -u -r1.9 ExportFLAC.cpp
+--- src/export/ExportFLAC.cpp	23 Sep 2006 02:26:41 -0000	1.9
++++ src/export/ExportFLAC.cpp	20 Oct 2006 22:46:32 -0000
+@@ -41,6 +41,13 @@
+ 
+ #define SAMPLES_PER_RUN 8192
+ 
++/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see <FLAC++/export.h>) */
++#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ bool ExportFLAC(AudacityProject *project,
+                 int numChannels, wxString fName,
+                 bool selectionOnly, double t0, double t1, MixerSpec *mixerSpec)
+@@ -58,7 +65,9 @@
+       gPrefs->Read(wxT("/FileFormats/FLACBitDepth"), wxT("16"));
+    
+    FLAC::Encoder::File *encoder= new FLAC::Encoder::File();
++#ifdef LEGACY_FLAC
+    encoder->set_filename(OSFILENAME(fName));
++#endif
+    encoder->set_channels(numChannels);
+    encoder->set_sample_rate(int(rate + 0.5));
+ 
+@@ -72,7 +81,11 @@
+     	format=int16Sample;
+    	encoder->set_bits_per_sample(16);
+    }
+-   encoder->init();
++#ifdef LEGACY_FLAC
++   encoder->init(); // really should check the return value here...
++#else
++   encoder->init(OSFILENAME(fName)); // really should check the return value here...
++#endif
+    
+    int numWaveTracks;
+    WaveTrack **waveTracks;
+@@ -129,7 +142,7 @@
+    return !cancelling;
+ }
+ 
+-#endif // USE_LIBVORBIS
++#endif // USE_LIBFLAC
+ 
+ 
+ // Indentation settings for Vim and Emacs and unique identifier for Arch, a
+Index: src/import/ImportFLAC.cpp
+===================================================================
+RCS file: /cvsroot/audacity/audacity-src/src/import/ImportFLAC.cpp,v
+retrieving revision 1.16
+diff -u -r1.16 ImportFLAC.cpp
+--- src/import/ImportFLAC.cpp	23 Sep 2006 02:26:55 -0000	1.16
++++ src/import/ImportFLAC.cpp	20 Oct 2006 22:46:32 -0000
+@@ -63,6 +63,13 @@
+ #include "../WaveTrack.h"
+ #include "ImportPlugin.h"
+ 
++/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see <FLAC++/export.h>) */
++#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ class FLACImportFileHandle;
+ 
+ class MyFLACFile : public FLAC::Decoder::File
+@@ -264,6 +271,7 @@
+ 
+ bool FLACImportFileHandle::Init()
+ {
++#ifdef LEGACY_FLAC
+    bool success = mFile->set_filename(OSFILENAME(mName));
+    if (!success) {
+       return false;
+@@ -272,11 +280,23 @@
+    if (state != FLAC__FILE_DECODER_OK) {
+       return false;
+    }
++#else
++   if (mFile->init(OSFILENAME(mName)) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++      return false;
++   }
++#endif
+    mFile->process_until_end_of_metadata();
++#ifdef LEGACY_FLAC
+    state = mFile->get_state();
+    if (state != FLAC__FILE_DECODER_OK) {
+       return false;
+    }
++#else
++   // not necessary to check state, error callback will catch errors, but here's how:
++   if (mFile->get_state() > FLAC__STREAM_DECODER_READ_FRAME) {
++      return false;
++   }
++#endif
+    if (!mFile->is_valid() || mFile->get_was_error())
+    {
+       // This probably is not a FLAC file at all
+@@ -340,7 +360,11 @@
+       mChannels[1]->SetTeamed(true);
+    }
+ 
++#ifdef LEGACY_FLAC
+    mFile->process_until_end_of_file();
++#else
++   mFile->process_until_end_of_stream();
++#endif
+    
+    *outTracks = new Track *[*outNumTracks];
+    for(c = 0; c < *outNumTracks; c++) {