Patch from Josh Coalson to be compatible with flac 1.1.3, pinning dep to 1.1.2 for non patched version

(Portage version: 2.1.2_rc3-r2)

4 files changed, 149 insertions, 4 deletions

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/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++) {