Add support for ffmpegsource

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 20 insertions, 22 deletions

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index dd3b481fd37e..7481cc724a2d 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/x264-encoder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.55 2011/08/27 18:54:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.56 2011/09/03 18:30:29 maksbotan Exp $
+
+  03 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org> x264-encoder-9999.ebuild,
+  metadata.xml:
+  Add support for media-libs/ffmpegsource, bug #301055. Thanks to Nikoli
+  <nikoli@lavabit.com>
 
   27 Aug 2011; Alexis Ballier <aballier@gentoo.org>
   -x264-encoder-0.0.20100605.ebuild, -x264-encoder-0.0.20101029.ebuild,
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 9aeeb3ebe52f..1a8b181a08da 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX x264-encoder-nolib-20110425.patch 1547 RMD160 ace0273445d751bf1b538abad364e3b738dad21c SHA1 2cdb96488785f1f355018d0b6727b3bd373d43a6 SHA256 124955cb5322d5f40771669798217991826dbc1f8ca9daac821d672238011c88
 AUX x264-encoder-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
 DIST x264-snapshot-20110426-2245.tar.bz2 495607 RMD160 3104b39f695a08c8199298eb89d5c500ffebfb45 SHA1 b2aa061648354aa80adeeba33819d8b961185dbc SHA256 2610ea30eb8857f7b8933137f8994f83243038fd8e336343e3422a5f25459fcc
 EBUILD x264-encoder-0.0.20110426.ebuild 1601 RMD160 662ea7c2892182b8f34c9dea40a4b2311716e145 SHA1 7c02087be895a085e1735feb9429fe19b0984346 SHA256 02761fcfe6dc5ba24bd994c5d9a74c95bb5e41633f52096f8b7d05374069ed70
-EBUILD x264-encoder-9999.ebuild 1916 RMD160 40b0deb3d741a072cb2cac8e54a60355f67b5ff7 SHA1 38b7edc828fa357c4fa5cd9e13cfcbb06907df8a SHA256 832304c5ec4db8bcc44a97f5416996d85fa3a5b3e0e24637891f70a912cdc7d7
-MISC ChangeLog 9100 RMD160 8a3b23a11dd7b4472a5ded5a8aeba95ef1166975 SHA1 290306bd3f35474112a0413681548190e9424931 SHA256 eda6ca738c516a6dabf43136decbe1ae4447ceeb15816313a56e7cb3d65b86dd
-MISC metadata.xml 317 RMD160 a62cf940e58bad8ce6e3f6e0f0782f64bafc18c3 SHA1 f8a93cc0b4ae862ee1529130a2416b1e40f43a16 SHA256 f4416403c4097e914e6a9dabe9c25f3e2dffeed8bcb4c9757476194e5bc05733
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk5ZPWMACgkQvFcC4BYPU0rPqQCggiFG9Uax49u0SrkTo5oWW5Ek
-R5IAnibmmXNjZqb/utgo6T9yCSYWI1XB
-=Fhba
------END PGP SIGNATURE-----
+EBUILD x264-encoder-9999.ebuild 2045 RMD160 53c69d395e4c2a4631336b926b873a49bc9047f8 SHA1 12e8ed11e22c8dc8bbed738fc5095df306311e17 SHA256 7e005152b6dd43f8b1463991eb7fc315e808aa751db8a5d5addd0835f608256c
+MISC ChangeLog 9292 RMD160 e054f30424faf3d3337409c9d404fdc7ff92b04e SHA1 7b16fd3eb5f3ae19141d4271deffa66434cd65f8 SHA256 86874258a420ca88a9d8bd1b5c8f52a502074c694eb8f68eb7699dbd566b6b64
+MISC metadata.xml 406 RMD160 9029a6c8e8c3ef9b95ac115348a03046093d0b4e SHA1 7751f58fededb0730443270d9de41c788f5ff0f3 SHA256 76b280c774fb996541b22ceb6ec5d6acf35593c1962c14f157409626e114a510
diff --git a/media-video/x264-encoder/metadata.xml b/media-video/x264-encoder/metadata.xml
index baa755b35bb5..1fa136c01515 100644
--- a/media-video/x264-encoder/metadata.xml
+++ b/media-video/x264-encoder/metadata.xml
@@ -6,6 +6,7 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="ffmpegsource">Enable ffmpegsource aka ffms support, disables lavf</flag>
     <flag name="system-libx264">Use the system x264 library</flag>
   </use>
 </pkgmetadata>
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 51167bf57478..00ccc8d1b642 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-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/x264-encoder/x264-encoder-9999.ebuild,v 1.1 2011/05/28 12:04:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild,v 1.2 2011/09/03 18:30:29 maksbotan Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ fi
 inherit multilib toolchain-funcs ${V_ECLASS}
 
 if [ "${PV#9999}" = "${PV}" ] ; then
-	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+	MY_P="x264-snapshot-$(get_version_component_range 3)-2245-stable"
 fi
 DESCRIPTION="A free commandline encoder for X264/AVC streams"
 HOMEPAGE="http://www.videolan.org/developers/x264.html"
@@ -21,7 +21,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="git://git.videolan.org/x264.git"
 	SRC_URI=""
 else
-	SRC_URI="http://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
 fi
 
 LICENSE="GPL-2"
@@ -31,10 +31,13 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="debug ffmpeg mp4 +system-libx264 +threads"
+IUSE="debug ffmpeg ffmpegsource mp4 +system-libx264 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
 
 RDEPEND="
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( virtual/ffmpeg )
+	ffmpegsource? ( media-libs/ffmpegsource )
 	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
 	system-libx264? ( ~media-libs/x264-${PV} )
 "
@@ -56,6 +59,7 @@ src_configure() {
 	local myconf=""
 	use debug && myconf+=" --enable-debug"
 	use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
+	use ffmpegsource || myconf+=" --disable-ffms"
 	use mp4 || myconf+=" --disable-gpac"
 	use system-libx264 && myconf+=" --system-libx264"
 	use threads || myconf+=" --disable-thread"
@@ -64,11 +68,9 @@ src_configure() {
 		--prefix="${EPREFIX}"/usr \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--disable-avs \
-		--disable-ffms \
 		--extra-asflags="${ASFLAGS}" \
 		--extra-cflags="${CFLAGS}" \
 		--extra-ldflags="${LDFLAGS}" \
 		--host="${CHOST}" \
-		${myconf} \
-		|| die
+		${myconf} || die
 }