diff options
| -rw-r--r-- | media-sound/audacity/ChangeLog | 10 | ||||
| -rw-r--r-- | media-sound/audacity/audacity-1.1.1.ebuild | 34 | ||||
| -rw-r--r-- | media-sound/audacity/files/digest-audacity-1.1.1 | 1 | ||||
| -rw-r--r-- | media-sound/audacity/files/mono_mp3_export.patch | 150 |
4 files changed, 194 insertions, 1 deletions
diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog index e8f0c8086d5b..976e6b71e034 100644 --- a/media-sound/audacity/ChangeLog +++ b/media-sound/audacity/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-sound/audacity # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.5 2002/11/10 18:45:31 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.6 2003/01/15 19:02:57 raker Exp $ + +*audacity-1.1.1 (15 Jan 2003) + + 15 Jan 2003; Nick Hadaway <raker@gentoo.org> audacity-1.1.1.ebuild, + files/digest-audacity-1.1.1, files/mono_mp3_export.patch : + Version bump. Marked stable as it depends on wxGTK-2.4.x which + has also been released as stable. Thanks to the anonymous + "Gentoo User" on bug #13978 for the mono patch. *audacity-1.1.0 (10 Nov 2002) diff --git a/media-sound/audacity/audacity-1.1.1.ebuild b/media-sound/audacity/audacity-1.1.1.ebuild new file mode 100644 index 000000000000..b343abc92fb3 --- /dev/null +++ b/media-sound/audacity/audacity-1.1.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.1.1.ebuild,v 1.1 2003/01/15 19:02:57 raker Exp $ + +IUSE="oggvorbis" +DESCRIPTION="A free, crossplatform audio editor." +HOMEPAGE="http://audacity.sourceforge.net/" +LICENSE="GPL-2" +DEPEND=">=x11-libs/wxGTK-2.4.0 + oggvorbis? ( media-libs/libvorbis ) + app-arch/zip + media-sound/mad + media-libs/id3lib" +SLOT="0" +KEYWORDS="x86" +SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tgz" +S="${WORKDIR}/${PN}-src-${PV}" +inherit eutils + +src_unpack() { + unpack ${PN}-src-${PV}.tgz + cd ${S} + epatch ${FILESDIR}/mono_mp3_export.patch || die +} + +src_compile() { + econf || die + MAKEOPTS=-j1 emake || die +} + +src_install () { + make PREFIX="${D}/usr" install || die + dodoc LICENSE.txt README.txt +} diff --git a/media-sound/audacity/files/digest-audacity-1.1.1 b/media-sound/audacity/files/digest-audacity-1.1.1 new file mode 100644 index 000000000000..e2f6eff266dd --- /dev/null +++ b/media-sound/audacity/files/digest-audacity-1.1.1 @@ -0,0 +1 @@ +MD5 70ffc1f9b076bccd4892148a87a24502 audacity-src-1.1.1.tgz 2310533 diff --git a/media-sound/audacity/files/mono_mp3_export.patch b/media-sound/audacity/files/mono_mp3_export.patch new file mode 100644 index 000000000000..18bed1aeeb09 --- /dev/null +++ b/media-sound/audacity/files/mono_mp3_export.patch @@ -0,0 +1,150 @@ +diff -ru audacity-src-1.1.1-3/src/export/ExportMP3.cpp /var/tmp/portage/audacity-1.1.1/work/audacity-src-1.1.1-3/src/export/ExportMP3.cpp +--- audacity-src-1.1.1-3/src/export/ExportMP3.cpp 2002-11-11 00:58:21.000000000 -0600 ++++ /var/tmp/portage/audacity-1.1.1/work/audacity-src-1.1.1-3/src/export/ExportMP3.cpp 2003-01-15 00:30:29.000000000 -0600 +@@ -190,6 +190,7 @@ + /* function pointers to the symbols we get from the library */ + lame_init_t* lame_init; + lame_init_params_t* lame_init_params; ++ lame_encode_buffer_t* lame_encode_buffer; + lame_encode_buffer_interleaved_t* lame_encode_buffer_interleaved; + lame_encode_flush_t* lame_encode_flush; + lame_close_t* lame_close; +@@ -259,6 +260,10 @@ + "get_lame_version"); + lame_init_params = + (lame_init_params_t *) wxDllLoader::GetSymbol(libHandle, "lame_init_params"); ++ ++ lame_encode_buffer = ++ (lame_encode_buffer_t *) wxDllLoader::GetSymbol(libHandle, ++ "lame_encode_buffer"); + lame_encode_buffer_interleaved = + (lame_encode_buffer_interleaved_t *) wxDllLoader::GetSymbol(libHandle, + "lame_encode_buffer_interleaved"); +@@ -294,6 +299,7 @@ + if (!lame_init || + !get_lame_version || + !lame_init_params || ++ !lame_encode_buffer || + !lame_encode_buffer_interleaved || + !lame_encode_flush || + !lame_close || +@@ -346,6 +352,22 @@ + mOutBufferSize); + } + ++ ++ ++ int EncodeBufferMono(short int inbuffer[], unsigned char outbuffer[]) { ++ if(!mEncoding) return -1; ++ ++ return lame_encode_buffer(mGF, inbuffer,inbuffer, mSamplesPerChunk, ++ outbuffer, mOutBufferSize); ++ } ++ ++ int EncodeRemainderMono(short int inbuffer[], int nSamples, ++ unsigned char outbuffer[]) { ++ return lame_encode_buffer(mGF, inbuffer, inbuffer, nSamples, outbuffer, ++ mOutBufferSize); ++ } ++ ++ + int FinishStream(unsigned char outbuffer[]) { + mEncoding = false; + int result = lame_encode_flush(mGF, outbuffer, mOutBufferSize); +@@ -425,6 +447,7 @@ + /* function pointers to the symbols we get from the library */ + lame_init_t* lame_init; + lame_init_params_t* lame_init_params; ++ lame_encode_buffer_t* lame_encode_buffer; + lame_encode_buffer_interleaved_t* lame_encode_buffer_interleaved; + lame_encode_flush_t* lame_encode_flush; + lame_close_t* lame_close; +@@ -556,6 +579,10 @@ + FindSymbol(connID, name, &mainAddr, &symClass); + lame_encode_buffer_interleaved = NewMachOFromCFM(mainAddr); + ++ MakePString(name, "lame_encode_buffer"); ++ FindSymbol(connID, name, &mainAddr, &symClass); ++ lame_encode_buffer = NewMachOFromCFM(mainAddr); ++ + MakePString(name, "lame_encode_flush"); + FindSymbol(connID, name, &mainAddr, &symClass); + lame_encode_flush = NewMachOFromCFM(mainAddr); +@@ -594,6 +621,7 @@ + if (!lame_init || + !get_lame_version || + !lame_init_params || ++ !lame_encode_buffer || + !lame_encode_buffer_interleaved || + !lame_encode_flush || + !lame_close || +@@ -636,7 +664,7 @@ + int EncodeBuffer(short int inbuffer[], unsigned char outbuffer[]) { + if(!mEncoding) return -1; + +- return lame_encode_buffer_interleaved(mGF, inbuffer, mSamplesPerChunk, ++ return lame_encode_buffer_interleaved(mGF, inbuffer, inbuffer, mSamplesPerChunk, + outbuffer, mOutBufferSize); + } + +@@ -646,6 +674,19 @@ + mOutBufferSize); + } + ++ int EncodeBufferMono(short int inbuffer[], unsigned char outbuffer[]) { ++ if(!mEncoding) return -1; ++ ++ return lame_encode_buffer(mGF, inbuffer, inbuffer, mSamplesPerChunk, ++ outbuffer, mOutBufferSize); ++ } ++ ++ int EncodeRemainderMono(short int inbuffer[], int nSamples, ++ unsigned char outbuffer[]) { ++ return lame_encode_buffer(mGF, inbuffer, inbuffer , inbuffer, nSamples, outbuffer, ++ mOutBufferSize); ++ } ++ + int FinishStream(unsigned char outbuffer[]) { + mEncoding = false; + int result = lame_encode_flush(mGF, outbuffer, mOutBufferSize); +@@ -1285,9 +1326,22 @@ + short *mixed = (short *)mixer->GetBuffer(); + + if(lastFrame) +- bytes = GetMP3Exporter()->EncodeRemainder(mixed, numSamples, buffer); +- else +- bytes = GetMP3Exporter()->EncodeBuffer(mixed, buffer); ++ ++ if (stereo) { ++ bytes = GetMP3Exporter()->EncodeRemainder(mixed, numSamples , buffer); ++ } ++ else{ ++ bytes = GetMP3Exporter()->EncodeRemainderMono(mixed, numSamples , buffer); ++ } ++ else { ++ ++ if (stereo) { ++ bytes = GetMP3Exporter()->EncodeBuffer(mixed, buffer); ++ } ++ else { ++ bytes = GetMP3Exporter()->EncodeBufferMono(mixed, buffer); ++ } ++ } + + outFile.Write(buffer, bytes); + +diff -ru audacity-src-1.1.1-3/src/export/ExportMP3.h /var/tmp/portage/audacity-1.1.1/work/audacity-src-1.1.1-3/src/export/ExportMP3.h +--- audacity-src-1.1.1-3/src/export/ExportMP3.h 2002-11-11 00:58:21.000000000 -0600 ++++ /var/tmp/portage/audacity-1.1.1/work/audacity-src-1.1.1-3/src/export/ExportMP3.h 2003-01-15 00:30:29.000000000 -0600 +@@ -38,6 +38,11 @@ + virtual int EncodeBuffer(short int inbuffer[], unsigned char outbuffer[]) = 0; + virtual int EncodeRemainder(short int inbuffer[], int nSamples, + unsigned char outbuffer[]) = 0; ++ ++ virtual int EncodeBufferMono(short int inbuffer[], unsigned char outbuffer[]) = 0; ++ virtual int EncodeRemainderMono(short int inbuffer[], int nSamples, ++ unsigned char outbuffer[]) = 0; ++ + virtual int FinishStream(unsigned char outbuffer[]) = 0; + virtual void CancelEncoding() = 0; + |