Patch to build with external twolame, thanks to Fabrice Delliaux, bug #158340

Package-Manager: portage-2.1.2-r6

4 files changed, 136 insertions, 16 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 7d04a1d00a79..4e15c363151a 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.108 2007/02/02 16:00:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.109 2007/02/03 13:11:28 aballier Exp $
+
+  03 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/avidemux-2.3.0-twolame.patch, avidemux-2.3.0.ebuild:
+  Patch to build with external twolame, thanks to Fabrice Delliaux, bug #158340
 
   02 Feb 2007; Alexis Ballier <aballier@gentoo.org>
   +files/avidemux-2.3.0-amprogas.patch, avidemux-2.3.0.ebuild:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index a3453cc629c0..04d4b58f3bed 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -21,6 +21,10 @@ AUX avidemux-2.3.0-po.makefile.patch 750 RMD160 2d8faa77bb8c4c670b6aee925451282b
 MD5 bf3b3bc7f5684849698077e2a0188c05 files/avidemux-2.3.0-po.makefile.patch 750
 RMD160 2d8faa77bb8c4c670b6aee925451282b097aa916 files/avidemux-2.3.0-po.makefile.patch 750
 SHA256 589f5c71f6a740a315d9da05f4ee004e74b04867c0206cff6e7c5c7e572a1615 files/avidemux-2.3.0-po.makefile.patch 750
+AUX avidemux-2.3.0-twolame.patch 4288 RMD160 9b29ea6ef756901b8a017fd8376b201ccbf7bda7 SHA1 e845cc2b0a7915d138728b046c5eb8dbbab8611c SHA256 b14a123fa1c6c9a99dc7911050e0a6754dde05aec8862949bab3dda01f7b8350
+MD5 f1f673c0037bf089031ce97e31296698 files/avidemux-2.3.0-twolame.patch 4288
+RMD160 9b29ea6ef756901b8a017fd8376b201ccbf7bda7 files/avidemux-2.3.0-twolame.patch 4288
+SHA256 b14a123fa1c6c9a99dc7911050e0a6754dde05aec8862949bab3dda01f7b8350 files/avidemux-2.3.0-twolame.patch 4288
 AUX avidemux-altivec.patch 9371 RMD160 8347497a6888515169e80fb28cc5d768c8ef7b32 SHA1 4ac716eb8dffa2327c10d9d8927044790fae39f4 SHA256 74b2e5b86bbdf204636cbf1f339d339e14be1ef89f67b47cf3c2fd6fcad83bf2
 MD5 7709231a89b035414b4877681aa78dc1 files/avidemux-altivec.patch 9371
 RMD160 8347497a6888515169e80fb28cc5d768c8ef7b32 files/avidemux-altivec.patch 9371
@@ -42,14 +46,14 @@ EBUILD avidemux-2.1_pre1.ebuild 3173 RMD160 c344c73302b5b14b9a01b1186059f2eeb5af
 MD5 18fe28a4bc669584f38bc88bfb06cb88 avidemux-2.1_pre1.ebuild 3173
 RMD160 c344c73302b5b14b9a01b1186059f2eeb5af9e38 avidemux-2.1_pre1.ebuild 3173
 SHA256 33c4babb491a2e64ddf5989f949890fff35d24614684cc4a8c67e2cd08328bca avidemux-2.1_pre1.ebuild 3173
-EBUILD avidemux-2.3.0.ebuild 3471 RMD160 39fdcd2331f469a43e526aaeca8343fb994f1fbb SHA1 1ee97ef150716034faa88a8caa9931b6c3be7231 SHA256 921224426b7b27e31b7ada27203b2f91bec2dd83bee87f5cdea8d111107034d9
-MD5 bba3feeb439fd5dd1d433a1711c1480c avidemux-2.3.0.ebuild 3471
-RMD160 39fdcd2331f469a43e526aaeca8343fb994f1fbb avidemux-2.3.0.ebuild 3471
-SHA256 921224426b7b27e31b7ada27203b2f91bec2dd83bee87f5cdea8d111107034d9 avidemux-2.3.0.ebuild 3471
-MISC ChangeLog 19810 RMD160 bea7fe9ffabb81c881b99eabdcf0dab68a41f786 SHA1 2e5d8ee6baff14da695ff8b132d98f8d341d2283 SHA256 a57d680cd28ebcbf2cb55224f8921883c8d979a2395ab1f210b27da8e163f38b
-MD5 b0a31fef55ad0ad838408f693c33209f ChangeLog 19810
-RMD160 bea7fe9ffabb81c881b99eabdcf0dab68a41f786 ChangeLog 19810
-SHA256 a57d680cd28ebcbf2cb55224f8921883c8d979a2395ab1f210b27da8e163f38b ChangeLog 19810
+EBUILD avidemux-2.3.0.ebuild 3414 RMD160 5728bdcc5ec47c04c19652225a48d5baf178e0bc SHA1 ca79f64825b43b29fc6098a8253b8dc4981559cc SHA256 18ff6c4d29362f8679e1d2085f6c0d29563ca37851b0562db85c7cd46d33d149
+MD5 f27c80b182701865e46d22bf9051c0b0 avidemux-2.3.0.ebuild 3414
+RMD160 5728bdcc5ec47c04c19652225a48d5baf178e0bc avidemux-2.3.0.ebuild 3414
+SHA256 18ff6c4d29362f8679e1d2085f6c0d29563ca37851b0562db85c7cd46d33d149 avidemux-2.3.0.ebuild 3414
+MISC ChangeLog 20005 RMD160 a7fef722dab3a4f7f3adb743314171647aa247a3 SHA1 758a9a6c650c71120d32e4ac09fa7124224c3f59 SHA256 55820d35835ef657110f98121962230844521e8acd44a8bd92859314cfefc5c3
+MD5 2edede81704f14d260f690d623150025 ChangeLog 20005
+RMD160 a7fef722dab3a4f7f3adb743314171647aa247a3 ChangeLog 20005
+SHA256 55820d35835ef657110f98121962230844521e8acd44a8bd92859314cfefc5c3 ChangeLog 20005
 MISC metadata.xml 318 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 SHA1 b9cd3e9f43bdd337eb81270e723569d1b4865e1a SHA256 4379b50013e723e18c04e42b0750112cb17af07b82a7b0e3b7aa32bd502124ba
 MD5 d5c5ccb29604d60b3222d8d620b9a55e metadata.xml 318
 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 metadata.xml 318
@@ -64,9 +68,9 @@ MD5 fda1590238aeae5793a212a88836635b files/digest-avidemux-2.3.0 247
 RMD160 e6bc5a151861e06a0df2a5d143d03d200472c55e files/digest-avidemux-2.3.0 247
 SHA256 9e7c104e7929ebe25b34ce8c772b4c888865242eb143abddc5f4cd77e0357e4d files/digest-avidemux-2.3.0 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFw2AOvFcC4BYPU0oRAiEhAJ43BALqXluHVca1U/kScY3t5vTVIACfYdUd
-E4s4Lcairlqqur1SBvfTpUs=
-=7FBG
+iD8DBQFFxIoHvFcC4BYPU0oRAgHbAJ99c9/2IEWwHa369w8M1WMHxUh3YwCfdwGF
+IVtASw/Qkhqg+NBnCvrnU4E=
+=HM6v
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.3.0.ebuild b/media-video/avidemux/avidemux-2.3.0.ebuild
index e97b0a2cdb79..27eed20c31e3 100644
--- a/media-video/avidemux/avidemux-2.3.0.ebuild
+++ b/media-video/avidemux/avidemux-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.4 2007/02/02 16:00:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.5 2007/02/03 13:11:28 aballier Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -22,6 +22,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.6
 	>=dev-libs/libxml2-2.6.7
 	>=dev-lang/spidermonkey-1.5-r2
+	>=media-sound/twolame-0.3.6
 	a52? ( >=media-libs/a52dec-0.7.4 )
 	encode? ( >=media-sound/lame-3.93 )
 	aac? ( >=media-libs/faac-1.23.5
@@ -42,7 +43,6 @@ RDEPEND="
 			x11-libs/libXext
 			x11-libs/libXrender
 		) virtual/x11 )"
-# media-sound/toolame is supported as well
 
 DEPEND="$RDEPEND
 	|| ( (
@@ -80,7 +80,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-configure.patch"
 	epatch "${FILESDIR}/${P}-po.makefile.patch"
 	epatch "${FILESDIR}/${P}-amprogas.patch"
-	#sed -i -e 's/x264=no,-lm/x264=no,-lm -lX11/' configure.in.in || die "sed failed."
+	epatch "${FILESDIR}/${P}-twolame.patch"
 
 	AT_M4DIR="m4" eautoreconf
 }
diff --git a/media-video/avidemux/files/avidemux-2.3.0-twolame.patch b/media-video/avidemux/files/avidemux-2.3.0-twolame.patch
new file mode 100644
index 000000000000..450a3500b573
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.3.0-twolame.patch
@@ -0,0 +1,112 @@
+diff -u -r -B avidemux_2.3.0.old/avidemux/ADM_audiofilter/audioencoder_twolame.cpp avidemux_2.3.0/avidemux/ADM_audiofilter/audioencoder_twolame.cpp
+--- avidemux_2.3.0.old/avidemux/ADM_audiofilter/audioencoder_twolame.cpp	2007-02-03 13:29:35.000000000 +0100
++++ avidemux_2.3.0/avidemux/ADM_audiofilter/audioencoder_twolame.cpp	2007-02-03 13:30:01.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ extern "C"
+ {
+-#include "libtoolame/twolame.h"
++#include <twolame.h>
+ }
+ #include "ADM_toolkit/ADM_debugID.h"
+ #define MODULE_NAME MODULE_AUDIO_FILTER
+diff -u -r -B avidemux_2.3.0.old/avidemux/Makefile.am avidemux_2.3.0/avidemux/Makefile.am
+--- avidemux_2.3.0.old/avidemux/Makefile.am	2007-02-03 13:29:35.000000000 +0100
++++ avidemux_2.3.0/avidemux/Makefile.am	2007-02-03 13:31:45.000000000 +0100
+@@ -17,7 +17,7 @@
+ 	ADM_colorspace ADM_editor ADM_encoder ADM_filter  ADM_inpics ADM_nuv \
+ 	ADM_toolkit oplug_mpeg xpm ADM_video oplug_avi ADM_audiodevice ADM_vp32 \
+ 	libMpeg2Dec oplug_mpegFF ADM_h263 ADM_gui2 ADM_dialog \
+-	ADM_ogm ADM_3gp mpeg2enc ADM_openDML ADM_lvemux libtoolame ADM_requant \
++	ADM_ogm ADM_3gp mpeg2enc ADM_openDML ADM_lvemux ADM_requant \
+ 	ADM_script oplug_ogm ADM_xvidratectl ADM_mplex ADM_ocr ADM_libswscale \
+ 	ADM_mpegdemuxer ADM_tray ADM_lavutil ADM_lavformat ADM_lavcodec oplug_mp4 \
+ 	ADM_avsproxy  ADM_liba52 ADM_libMad ADM_matroska ADM_asf
+@@ -63,7 +63,6 @@
+ ./ADM_video/libADM_video.a   ./ADM_encoder/libADM_encoder.a  \
+ ./ADM_codecs/libADM_codecs.a ./ADM_vp32/libADM_vp32.a  \
+ ./ADM_audiofilter/libADM_audiofilter.a \
+-./libtoolame/liblibtoolame.a \
+ ./ADM_gui2/libADM_gui2.a  \
+ ./ADM_libswscale/libswscale.a \
+ ./mpeg2enc/libmpeg2enc.a \
+@@ -91,17 +90,19 @@
+ ./ADM_library/libADM_library.a \
+ ./ADM_toolkit/libADM_toolkit.a  \
+ ./libass/libass.a \
+-$(libmpeg2enc_Altivec) 
++$(libmpeg2enc_Altivec) \
++$(TWOLAME_LIBS)
+ 
+ 
+ INCLUDES = $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) \
+ 	$(SMONKEY_CFLAGS) \
+ 	-DADMLOCALE='"'$(ADM_LOCALEDIR)'"' \
+-	-IADM_lavutil
++	-IADM_lavutil \
++	$(TWOLAME_CFLAGS)
+ 
+ # the library search path.
+ avidemux2_LDFLAGS = $(all_libraries)  $(SDL_LIBS) $(GTK_LIBS) \
+-	$(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS) 
++	$(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS)
+ 
+ noinst_HEADERS = ADM_pp.h admmangle.h
+ AM_CFLAGS = -g
+diff -u -r -B avidemux_2.3.0.old/configure.in avidemux_2.3.0/configure.in
+--- avidemux_2.3.0.old/configure.in	2007-02-03 13:29:35.000000000 +0100
++++ avidemux_2.3.0/configure.in	2007-02-03 13:30:01.000000000 +0100
+@@ -165,6 +165,37 @@
+    AC_SUBST(CCAS)
+    AC_SUBST(CCASFLAGS)
+ 
++
++dnl ____________TWOLAME____________
++   TWOLAME_LIBS=`$PKG_CONFIG twolame --libs`
++   TWOLAME_CFLAGS=`$PKG_CONFIG twolame --cflags`
++   TWOLAME_VERSION=`$PKG_CONFIG twolame --modversion`
++
++ if test "x$TWOLAME_VERSION" = "x" ; then
++  echo "************ Cannot identify TWOLAME version ***************"
++  AC_MSG_ERROR([*** pkg-config installed incorrectly or twolame absent ! ***])
++ fi
++ VEROK=`echo "$TWOLAME_VERSION" | perl -ne '@a=split(/\./,$_);
++                 if( $a[[0]] > 0 ) {
++                    print "OK"
++                }
++                else {
++                    if( $a[[1]] >= 3 and $a[[2]] >= 6 ) {
++                       print "OK"
++                    }
++                    else {
++                       print "FAILED"
++                    }
++                }'`
++ if test "x$VEROK" != "xOK" ; then
++  AC_MSG_ERROR([*** need twolame v0.3.6 or greater ! ***])
++ fi
++
++   AC_SUBST(TWOLAME_CFLAGS)
++   AC_SUBST(TWOLAME_LIBS)
++   AC_SUBST(TWOLAME_VERSION)
++
++
+ dnl ______________________
+ dnl AC_DEFINE(USE_DIV5,0,[Divx 5])
+ dnl AC_DEFINE(USE_AC3,0,[A52dec])
+@@ -1378,7 +1409,6 @@
+ AC_CONFIG_FILES([ avidemux/ADM_xvidratectl/Makefile ])
+ AC_CONFIG_FILES([ avidemux/libMpeg2Dec/Makefile ])
+ AC_CONFIG_FILES([ avidemux/libass/Makefile ])
+-AC_CONFIG_FILES([ avidemux/libtoolame/Makefile ])
+ AC_CONFIG_FILES([ avidemux/mpeg2enc/Makefile ])
+ AC_CONFIG_FILES([ avidemux/mpeg2enc/altivec/Makefile ])
+ AC_CONFIG_FILES([ avidemux/oplug_avi/Makefile ])
+@@ -1392,6 +1422,7 @@
+ AC_OUTPUT
+ dnl **   mean   ***
+ echo " GTK+ version        : $GTK_VERSION"
++echo " TwoLAME version     : $TWOLAME_VERSION"
+ echo " Divx5.0.5 ?         : $have_divx"
+ echo " *** DISABLED ***"
+ echo " Xvid 0.9 Codec      : $have_xx_xvid"