add libmodplug support

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index d7543bafa6aa27c7bf9798e681ca0748f89f552a..1256498f9eaa07f0adfd3bb190f789eb289218ee 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.465 2011/10/05 14:06:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.466 2011/10/05 14:17:52 aballier Exp $
+
+  05 Oct 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+  add libmodplug support
 
 *ffmpeg-0.8.5 (05 Oct 2011)
 *ffmpeg-0.7.6 (05 Oct 2011)

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 9cb71d551bebce9694b6b1279d7213860b164a90..2f8d90e606b7783348d6194745bc280e67772ea3 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,13 +9,13 @@ EBUILD ffmpeg-0.7.5.ebuild 8288 RMD160 02556fb1521f06440159b8b997556d8098812240
 EBUILD ffmpeg-0.7.6.ebuild 8298 RMD160 5c335c8c0b566644b8abd956b097497f3c08af45 SHA1 48079bdf1b0c42db360af5725abb87da2cd116e5 SHA256 662d21c1faaa25af22e13ae9c7173a966d7f99d1a2c29cf911251862d70d5a78
 EBUILD ffmpeg-0.8.4.ebuild 7830 RMD160 d5cd97a30fc588caca4ba3824a8109bd3a298d16 SHA1 8aea46ed3ce0dd70fac1c8a4553ba0791b74e270 SHA256 c4873bf468b1777c0c6c67ec2202f4ae429ceba246cd3edcc0f17b395844e322
 EBUILD ffmpeg-0.8.5.ebuild 7957 RMD160 6e36e2a9d2fa093900ac40959e845820d76ed0cb SHA1 f3e9ded0636709371afbb168370e988b1456b0c9 SHA256 66abdf62f56e1289cc44f37146bc7e6e7d17b9c3abc81b0efc39c8895db96b0c
-EBUILD ffmpeg-9999.ebuild 8152 RMD160 06723aa747e0d3a1ecc1973aeafb91ea6a4ea336 SHA1 a0ef7490cff78acb5bceb3fb007eee0113bb672e SHA256 691817ac88c32f63ce474ad14a404b4684dc776dc243b8fb099726fd1349fe95
-MISC ChangeLog 67730 RMD160 2394b41f64be378fb42b58871bb742ac3697f57a SHA1 98b2f0ff0326a34d5b51154c35a2c2d471f190de SHA256 659d335322088e4b472afd0e9ed09772fcc933da13b5339849a2bc8b52e83f38
+EBUILD ffmpeg-9999.ebuild 8205 RMD160 12d4ff89f2cea06e3d18b98d0669aefa25c85f99 SHA1 bf7a074fb7f300f6c8a354bc794de4f461b79a51 SHA256 63a91d00d22353bae2498b05530d3a8e3243c0a94a8c6995eefe66fefd42a803
+MISC ChangeLog 67828 RMD160 3e8c22e8029b64bd81e0ac2c7d0b574b1789b655 SHA1 ec933533f5f0922add513d84430aa441f9adbb94 SHA256 ae9d9cb22778e161a46f8090f8f6676448a101e3e81873c1b1f07e96a5562ffc
 MISC metadata.xml 2730 RMD160 30f7472831c62be2fd787b0c914681db7853361e SHA1 3a5abcd6fc24ce3e19497aa4b3d5cbf740ef7a4d SHA256 1e86d46c8891df413c68f98fe41e61691820fb66781717394a03327b907eeddc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6MZFYACgkQvFcC4BYPU0rwSQCeKwpLNRbWVbHy/Q7T30S3ZDCn
-8pIAmwTubsSvmQo1B6wTPj0Ghr5Glb8C
-=QmNi
+iEYEARECAAYFAk6MZxgACgkQvFcC4BYPU0oXqwCgt9knMXYI3tt/sAIWy1rYzeAF
+CTYAoMRdA6QoSGT9pUCFlxIMt0IKCsLa
+=WJnL
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 52845649fcaeb2849ad2e7b0dcc97547287c68b5..981063a5c59bd2efcf0d8b60d14396e3204716db 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.55 2011/09/27 18:14:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.56 2011/10/05 14:17:52 aballier Exp $
 
 EAPI="4"
 
@@ -30,9 +30,10 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 fi
 IUSE="
        aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc
-       +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network
-       openal oss pic qt-faststart rtmp schroedinger sdl speex static-libs test
-       theora threads truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib
+       +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k modplug mp3
+       network openal oss pic qt-faststart rtmp schroedinger sdl speex static-libs
+       test theora threads truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid
+       +zlib
        "
 
 # String for CPU features in the useflag[:configure_option] form
@@ -66,6 +67,7 @@ RDEPEND="
        ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
        jack? ( media-sound/jack-audio-connection-kit )
        jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+       modplug? ( media-libs/libmodplug )
        openal? ( >=media-libs/openal-1.1 )
        rtmp? ( >=media-video/rtmpdump-2.2f )
        sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
@@ -155,7 +157,7 @@ src_configure() {
 
        # Decoders
        use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
-       for i in celt gsm dirac rtmp schroedinger speex vpx; do
+       for i in celt gsm dirac modplug rtmp schroedinger speex vpx; do
                use ${i} && myconf="${myconf} --enable-lib${i}"
        done
        use jpeg2k && myconf="${myconf} --enable-libopenjpeg"