From: Alexis Ballier Date: Sat, 3 Feb 2007 23:07:41 +0000 (+0000) Subject: external twolame patch update from Fabrice Delliaux X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b1f3e736ce8a3ccf403dd9282823ff5c733fddd;p=gentoo.git external twolame patch update from Fabrice Delliaux Package-Manager: portage-2.1.2-r7 --- diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog index bcc648ff43c8..ddf51fb4410d 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.112 2007/02/03 17:36:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.113 2007/02/03 23:07:41 aballier Exp $ + + 03 Feb 2007; Alexis Ballier + files/avidemux-2.3.0-twolame.patch, avidemux-2.3.0.ebuild: + external twolame patch update from Fabrice Delliaux 03 Feb 2007; Alexis Ballier avidemux-2.3.0.ebuild: make install -> emake diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index f2b832b3fbc0..c63bbab1674a 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -17,19 +17,19 @@ 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-2.3.0-twolame.patch 4048 RMD160 45e4b1333cdc56934e73758a16ffb54ea2b81cad SHA1 ec8d4039a5b85f23484f981e68e71cfb0324825f SHA256 6c8a7b58882417536645611d75584145960a7b2dd499083ab24220f909c30ac8 +MD5 12783df6f9e5d7d6a00aba4f9dadc860 files/avidemux-2.3.0-twolame.patch 4048 +RMD160 45e4b1333cdc56934e73758a16ffb54ea2b81cad files/avidemux-2.3.0-twolame.patch 4048 +SHA256 6c8a7b58882417536645611d75584145960a7b2dd499083ab24220f909c30ac8 files/avidemux-2.3.0-twolame.patch 4048 DIST avidemux_2.3.0.tar.gz 4750919 RMD160 1e10183d4b80104a42d40bfd9d9e9b5c54843d9e SHA1 40a51db22593d910224dac91b512489a6af499fb SHA256 ef083ab24e3ec612b10c8a0163845ff680fea845d5eade21d60d47e843b4c623 -EBUILD avidemux-2.3.0.ebuild 3415 RMD160 b82d848672e4012343a20c3e6a51f57719367e98 SHA1 55fed4923bc2872677d54917954df5b3134f5476 SHA256 d1f8e88f8cec09bccddb50b97375b16e0c6f47e060dbd22718cd30194ead8746 -MD5 d49e5c8733c4413fd4a2bdaac57a8e8e avidemux-2.3.0.ebuild 3415 -RMD160 b82d848672e4012343a20c3e6a51f57719367e98 avidemux-2.3.0.ebuild 3415 -SHA256 d1f8e88f8cec09bccddb50b97375b16e0c6f47e060dbd22718cd30194ead8746 avidemux-2.3.0.ebuild 3415 -MISC ChangeLog 20418 RMD160 5e74cd994d02c02d53affad24fb06079ebfc88b3 SHA1 743bf9e3d9799f9b09ea78c1c742b0dbf497244c SHA256 221fa24812d478dd629868ca0c2ef5002674a84e17bb688e6a697a23c79791a3 -MD5 acd8baad8058d6ee008cfdedb249dd46 ChangeLog 20418 -RMD160 5e74cd994d02c02d53affad24fb06079ebfc88b3 ChangeLog 20418 -SHA256 221fa24812d478dd629868ca0c2ef5002674a84e17bb688e6a697a23c79791a3 ChangeLog 20418 +EBUILD avidemux-2.3.0.ebuild 3441 RMD160 e0a8ea40ba5095675db2a36b68167825606fc7fa SHA1 b6e3f4140042ea688f45cab103cb448c050a7798 SHA256 5cd583cade69c5c74bb1caa9a9d0f915e2da3ec57ea3dfb4ddd11cd0e29453d3 +MD5 17ac74bdb6f5f783b8134314b8841ce9 avidemux-2.3.0.ebuild 3441 +RMD160 e0a8ea40ba5095675db2a36b68167825606fc7fa avidemux-2.3.0.ebuild 3441 +SHA256 5cd583cade69c5c74bb1caa9a9d0f915e2da3ec57ea3dfb4ddd11cd0e29453d3 avidemux-2.3.0.ebuild 3441 +MISC ChangeLog 20587 RMD160 961fae26e486f7c618a79f6d708c78f40046d12d SHA1 fd42cff5fd9cd9efc43e7d640fcfb319553d222a SHA256 2ba93037bc44359d048c1092b5bc34507392e2268cd3ac58599e91c44309bcd8 +MD5 c884a3d8cf5d914b0bda47bf0eb2912b ChangeLog 20587 +RMD160 961fae26e486f7c618a79f6d708c78f40046d12d ChangeLog 20587 +SHA256 2ba93037bc44359d048c1092b5bc34507392e2268cd3ac58599e91c44309bcd8 ChangeLog 20587 MISC metadata.xml 318 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 SHA1 b9cd3e9f43bdd337eb81270e723569d1b4865e1a SHA256 4379b50013e723e18c04e42b0750112cb17af07b82a7b0e3b7aa32bd502124ba MD5 d5c5ccb29604d60b3222d8d620b9a55e metadata.xml 318 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 metadata.xml 318 @@ -40,7 +40,7 @@ SHA256 9e7c104e7929ebe25b34ce8c772b4c888865242eb143abddc5f4cd77e0357e4d files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFxMgSvFcC4BYPU0oRAm4wAJ9vdg2KtGzKO1+n0GQJHZb18ju6CwCfYWcd -sbAh2dYk1130yzLK5u8/mI8= -=x4s4 +iD8DBQFFxRXDvFcC4BYPU0oRApaUAJ9XwINYYElZlO3KlicdBcYuE2JxcACgxqYx +H/2HFuST0zho+zeKDzqToYQ= +=ZIPP -----END PGP SIGNATURE----- diff --git a/media-video/avidemux/avidemux-2.3.0.ebuild b/media-video/avidemux/avidemux-2.3.0.ebuild index da0087efaac7..2809e74f11a9 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.6 2007/02/03 17:36:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.7 2007/02/03 23:07:41 aballier Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -99,6 +99,7 @@ src_compile() { $(use_with truetype freetype2) \ $(use_enable aac faac) $(use_with aac faad2) \ $(use_with encode lame) \ + --with-extern-twolame \ --with-newfaad --with-jsapi-include=/usr/include/js \ --disable-warnings --disable-dependency-tracking \ ${myconf} || die "configure failed" diff --git a/media-video/avidemux/files/avidemux-2.3.0-twolame.patch b/media-video/avidemux/files/avidemux-2.3.0-twolame.patch index 450a3500b573..0b16d5aa06ad 100644 --- a/media-video/avidemux/files/avidemux-2.3.0-twolame.patch +++ b/media-video/avidemux/files/avidemux-2.3.0-twolame.patch @@ -1,6 +1,6 @@ -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 +diff -u -r 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 23:41:05.000000000 +0100 ++++ avidemux_2.3.0/avidemux/ADM_audiofilter/audioencoder_twolame.cpp 2007-02-03 23:41:19.000000000 +0100 @@ -30,7 +30,7 @@ extern "C" @@ -10,10 +10,10 @@ diff -u -r -B avidemux_2.3.0.old/avidemux/ADM_audiofilter/audioencoder_twolame.c } #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 @@ +diff -u -r 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 23:41:05.000000000 +0100 ++++ avidemux_2.3.0/avidemux/Makefile.am 2007-02-03 23:41:19.000000000 +0100 +@@ -17,10 +17,11 @@ 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 \ @@ -21,8 +21,13 @@ diff -u -r -B avidemux_2.3.0.old/avidemux/Makefile.am avidemux_2.3.0/avidemux/Ma + 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_avsproxy ADM_liba52 ADM_libMad ADM_matroska ADM_asf ++ ADM_avsproxy ADM_liba52 ADM_libMad ADM_matroska ADM_asf \ ++ $(TWOLAME_DIR) + + if HAVE_FREETYPE + SUBDIRS += libass +@@ -63,7 +64,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 \ @@ -30,7 +35,7 @@ diff -u -r -B avidemux_2.3.0.old/avidemux/Makefile.am avidemux_2.3.0/avidemux/Ma ./ADM_gui2/libADM_gui2.a \ ./ADM_libswscale/libswscale.a \ ./mpeg2enc/libmpeg2enc.a \ -@@ -91,17 +90,19 @@ +@@ -91,17 +91,19 @@ ./ADM_library/libADM_library.a \ ./ADM_toolkit/libADM_toolkit.a \ ./libass/libass.a \ @@ -53,59 +58,57 @@ diff -u -r -B avidemux_2.3.0.old/avidemux/Makefile.am avidemux_2.3.0/avidemux/Ma 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 @@ +diff -u -r avidemux_2.3.0.old/configure.in avidemux_2.3.0/configure.in +--- avidemux_2.3.0.old/configure.in 2007-02-03 23:41:05.000000000 +0100 ++++ avidemux_2.3.0/configure.in 2007-02-03 23:42:56.000000000 +0100 +@@ -165,6 +165,7 @@ AC_SUBST(CCAS) AC_SUBST(CCASFLAGS) + + dnl ______________________ + dnl AC_DEFINE(USE_DIV5,0,[Divx 5]) + dnl AC_DEFINE(USE_AC3,0,[A52dec]) +@@ -268,6 +269,34 @@ + AC_DEFINE(USE_LIBXML2,1,[LibXML2 is available]) + fi + +dnl ____________TWOLAME____________ -+ TWOLAME_LIBS=`$PKG_CONFIG twolame --libs` -+ TWOLAME_CFLAGS=`$PKG_CONFIG twolame --cflags` -+ TWOLAME_VERSION=`$PKG_CONFIG twolame --modversion` ++AC_ARG_WITH([extern-twolame], ++ AC_HELP_STRING([--without-extern-twolame], [Use builtin TwoLAME library (default: test)]), ++ [with_extern_twolame=${withval}], [with_extern_twolame=test]) + -+ 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) ++if test "x$with_extern_twolame" != "xno"; then ++ PKG_CHECK_MODULES(TWOLAME, twolame >= 0.3.6, have_twolame=external, ++ AC_MSG_ERROR([*** need twolame v0.3.6 or greater ! ***])) ++ ++ TWOLAME_VERSION=`$PKG_CONFIG twolame --modversion` ++ TWOLAME_DIR="" ++else ++ have_twolame=builtin ++ TWOLAME_VERSION=0.3.6 ++ TWOLAME_LIBS=./libtoolame/liblibtoolame.a ++ TWOLAME_CFLAGS= ++ TWOLAME_DIR=libtoolame ++fi + ++AC_MSG_CHECKING([which twolame support]) ++AC_MSG_RESULT($have_twolame) + - 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_SUBST(TWOLAME_CFLAGS) ++AC_SUBST(TWOLAME_LIBS) ++AC_SUBST(TWOLAME_VERSION) ++AC_SUBST(TWOLAME_DIR) ++ + + dnl __________________divx______________ + dnl __________________x264 ______________ +@@ -1392,6 +1421,8 @@ AC_OUTPUT dnl ** mean *** echo " GTK+ version : $GTK_VERSION" ++echo " TwoLAME support : $have_twolame" +echo " TwoLAME version : $TWOLAME_VERSION" echo " Divx5.0.5 ? : $have_divx" echo " *** DISABLED ***"