Revision bump, merge in 9999 ebuild stuff from multimedia overlay, add 10bit USE flag and use stable tarball rather than the unstable one.

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

4 files changed, 55 insertions, 28 deletions

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index c1cc68f2c3ee..aeedb4d89f29 100644
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/x264
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.60 2011/09/07 17:56:15 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.61 2011/09/07 23:17:44 chutzpah Exp $
+
+*x264-0.0.20110825-r1 (07 Sep 2011)
+
+  07 Sep 2011; Patrick McLean <chutzpah@gentoo.org> -x264-0.0.20110825.ebuild,
+  +x264-0.0.20110825-r1.ebuild, metadata.xml:
+  Revision bump, merge in 9999 ebuild stuff from multimedia overlay, add 10bit
+  USE flag and use stable tarball rather than the unstable one.
 
   07 Sep 2011; Patrick McLean <chutzpah@gentoo.org> x264-0.0.20110825.ebuild,
   metadata.xml:
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 5c5c2c00d9b4..179856322b9a 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -9,29 +9,29 @@ DIST x264-snapshot-20100605-2245.tar.bz2 422713 RMD160 379b728d53b642bb5ac6d8276
 DIST x264-snapshot-20101029-2245.tar.bz2 449078 RMD160 65691ea49254ac769a1dde5c03bbe190d7758390 SHA1 3153e901b69acbfcade2af9a59b52d357166ece0 SHA256 d6d1ac9450e2e345d6a4bf7e62a9b03256b10da8e4d62c829ba683a7566711f3
 DIST x264-snapshot-20110223-2245.tar.bz2 485914 RMD160 796edaaaa4c0983e48202628abc1624445c7dac7 SHA1 68cf65982666390cec2d875c521090958e4fd338 SHA256 95c0287102ab4f9b736fc83a1a17b74f6d4b1725ccf23cc619d453293f76a551
 DIST x264-snapshot-20110426-2245.tar.bz2 495607 RMD160 3104b39f695a08c8199298eb89d5c500ffebfb45 SHA1 b2aa061648354aa80adeeba33819d8b961185dbc SHA256 2610ea30eb8857f7b8933137f8994f83243038fd8e336343e3422a5f25459fcc
-DIST x264-snapshot-20110825-2245.tar.bz2 514353 RMD160 6aeb636d7b395969f9ad2a0e72ffc9ee0eea9e48 SHA1 d551f6f7482c6af022cdaded89668a0579bd88d5 SHA256 55afee361554818ccc4ee553d3d058a7fb584af155ec7eeab45cd778acec43c5
+DIST x264-snapshot-20110825-2245-stable.tar.bz2 516879 RMD160 4f1e00ddd170c75c6d3e140085358ff95c8e861f SHA1 0e8fff6252397d453b0f38cc0fdaf9699558194d SHA256 ab0ed4046a36093f00dfa572d7234c59cec5f6cb674d8bb0fe4e6bdd7604efa0
 EBUILD x264-0.0.20100605.ebuild 1502 RMD160 70f9d093035eac1511eac5f3ef001f88e17f0fec SHA1 fdadbfcd76a3e60198ba6d1ed09bea59a5b8b2d3 SHA256 bd8e77d53bfe9cddea913da054704d046676fbc47e6c6826a8746ebbf3d951b1
 EBUILD x264-0.0.20101029.ebuild 1560 RMD160 2da375a1037d09ce98325535258f8a1026114c37 SHA1 a76c6cf5f5870265b24dd93070e5dc7be91ccdad SHA256 a939a332f59fea480ac3b74141fa6dab75110de952629e27d504813d1cde4507
 EBUILD x264-0.0.20110223.ebuild 1526 RMD160 fb57c899f11215174009a1da6afcb0527f924164 SHA1 0845dcc3b312da131449e97cf8f77bdd6f5f9632 SHA256 760d2d03ce5b70789b6a9d137428e3263650ddcee8f7dcaae5063f5e6a0eb13d
 EBUILD x264-0.0.20110426.ebuild 1519 RMD160 7b0b0a8ef5608f161c45290bca846cca613592d1 SHA1 641c87721f45986d837d5da9730690c078d7dc33 SHA256 20405a5c868e308166ae2126427fe948afcd60e82c7b7537ec28a35b98a4da61
-EBUILD x264-0.0.20110825.ebuild 1931 RMD160 7b78e42e7a898d36424bdcfc247bebe27da1abaa SHA1 6d06d96e298c123a6cd8031dd3b03fab5e46604e SHA256 ca488337ede696565ddfa166d8f86abcb2ddd9f77e6acb585039bb4640d1b951
+EBUILD x264-0.0.20110825-r1.ebuild 2322 RMD160 c99dd517ef0665e0c7b0a21e5ca47fe82dc5443c SHA1 5c8c2eb23143c7ba098c9edf1e5f601922d368e4 SHA256 aba238d1961cd6a73a8d99d3767cb00484507b40b32aaa5f5de75037e44f2ced
 EBUILD x264-9999.ebuild 1800 RMD160 c51dd8ef3e3c5a36c379192afe3c822a1ae51aed SHA1 76747a28e5a39a4217c3e9dee09919c33b8491bd SHA256 3cf0076031f6e6bed11988278369110cdc04e70745c50e54cee97974a07996ad
-MISC ChangeLog 9020 RMD160 6e2379c313eb8157a51240180e4024ec28c4dc37 SHA1 4204142182a5bbe21ba4f37f282cfc455a9afbe2 SHA256 c22c9c1a1a21c9287cd771e5809ad5e79b293fb8f9f1c11ca1e8f8405a7c071b
-MISC metadata.xml 451 RMD160 dd6ec1d410a4192d4e93a3a94c06541f97afc91c SHA1 903c799299921137ac8b17270a76a030954f1272 SHA256 b29197959523b14be5a7cad8ec4f649592fc67e6e55b425835d6f297d0a89d79
+MISC ChangeLog 9326 RMD160 2faff6fd609ce916bdf9442ade51504d034ee0f7 SHA1 b9b5ebc8031445f35fa7ab35071255996924353a SHA256 6bada1f7d120538aecff786221589f848c6973fe50402d5704b75693667c79b1
+MISC metadata.xml 554 RMD160 2f57798883f3f6ceae8a0b596c5dd3fffd1dc90c SHA1 4dd25b830a0ad422d81de5500931f750b8508851 SHA256 1e4bcd3b571c5401aa3dc2f1e07801153596a4437d6309d1c7b6366e6cc552e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOZ7BFAAoJEHy/RO9cNQiDrcMQAMmUuJT+9irsZpJ/QLO7KlA1
-xZBF8PiUkwh/kp4qjxClEH8lPiLCeJGOgvKqn9dHZQj3QEf+63ri4gjzn5zvvARM
-B6jbcp8dCVY5QwYOU1R6PUxM3GZDOtWTSMwO8F+xyf1m8E/BZECrpdMwGhYv+pfl
-3cVkubgh7cMYH/a6hhwc8famMkWwKl7eWAIfQ/f2Yfar5QBxve8KPUgZ52WD+hJP
-Z+pxDEcMnDcThigWJCNf4BZlCqPLfGg2QFlU7+F5D944YLIysW0QxFDSOeg6g6XS
-i68xnfEmxsqNARdZpZ7FXgpjBMCXzf7aXAbUGc+oXZQZmjoQP3UFvoh1pKQRv9Ox
-yxRkh9eMQkB4SCvLzVJGpavTD/Ew0bcAEYK2VFB2CwTz7U9sAi36wpHJJXbwh/Kn
-cHj2gf9549oT/VH9blyfwdEXQDAt59aDp8V/ZITmJEhRzWyGuSoZyCyCSx2yMQpU
-15G5D09zozlhVQpqSsmtDwfr9QEcfXfkPL2bJah2j43h5e4I8zXDnwLan+4x5sb/
-5jXBNoms+ycmLyQgbwkSi65kz1JUKfsrqQD6x92cPcbb7GLtO+3Kke7l9iOigm7z
-aiG3/zdU3LQG9m/yfkEaCFzfCx3GXdDC156RLCWX+C0TVNLXy5jSUahulusGOSJY
-S+Ke7yrtSKu9idcsAl0H
-=kScO
+iQIcBAEBCAAGBQJOZ/ueAAoJEHy/RO9cNQiDbAAP/R6pHw5hsgi9G7VyifwupyE0
+JA2HgO5TVRkOp+OYh8X7gc2Kmpn8vrgq35HpOQbhnxa0MHIhQEBU9GrqjXbJwyk5
+J9S+B91bOROaRMbq/pxMuzEaVZZkGrIvTY6jg1ZtjQUYmEc7qKtL6EMVMkQvmF+y
+6taLGmqcs3FKmuCRmNE5zqYr5z5QydTpqMWVppZ0DWg2jM+1ulZclVByT3ikt8EY
+19TVuU83OqO8yd7yYV7hPwvx18hQr2jLa3AXQ0UNZ1igWxpIjC2Ar1LZ1wujMLUb
+fP3h09ZrST3Kecnmz1BoPhlREXOaWGPFpVYRn7fb/N6gIOlYY8e9WappLxHD1PJt
+LXUNyJ5cvtYHW9RnWpt4yJrKIM5Yl8kNoP4f2AIubDQztLBbnyUCswC6ilPhfITg
+QvVCRLb3xyvaZXHSRItf4qFsL+bwEQIxqXeWdttAlTfiOEbiqLwhppatOzXecATm
+oeRA7rZkwx2D/5Ibx2uQkZkEj7bakE7qLCXaPequk7KWeiJ6hwfjxp1htQ5DWCZJ
+zKOULSWWc8YQ3Fk7YqaqGpRyqIwLdXoEB+T5UPoiSC0RorSCELlrevN0QXyzMVSr
+1KErP1EV4NnemMOcbnIn/wGymdNGKXCrw28JJCjbzf48AstFUNYb2dex2dz6Z/Uk
+XjAJJQcPGhY3Trt03GQr
+=rDHv
 -----END PGP SIGNATURE-----
diff --git a/media-libs/x264/metadata.xml b/media-libs/x264/metadata.xml
index 321f7b28784f..c2547438ec91 100644
--- a/media-libs/x264/metadata.xml
+++ b/media-libs/x264/metadata.xml
@@ -8,5 +8,6 @@
   <use>
     <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
     <flag name="interlaced">enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>
+    <flag name="10bit">Set output bit depth to 10, this may not be compatible with all decoders</flag>
   </use>
 </pkgmetadata>
diff --git a/media-libs/x264/x264-0.0.20110825.ebuild b/media-libs/x264/x264-0.0.20110825-r1.ebuild
index 01612d74cd4d..410c03044abc 100644
--- a/media-libs/x264/x264-0.0.20110825.ebuild
+++ b/media-libs/x264/x264-0.0.20110825-r1.ebuild
@@ -1,27 +1,46 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20110825.ebuild,v 1.3 2011/09/07 17:56:15 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20110825-r1.ebuild,v 1.1 2011/09/07 23:17:44 chutzpah Exp $
 
 EAPI=4
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
-MY_P=x264-snapshot-$(get_version_component_range 3)-2245
+if [ "${PV#9999}" != "${PV}" ] ; then
+	V_ECLASS="git-2"
+else
+	V_ECLASS="versionator"
+fi
 
+inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS}
+
+if [ "${PV#9999}" = "${PV}" ]; then
+	MY_P="x264-snapshot-$(get_version_component_range 3)-2245-stable"
+fi
 DESCRIPTION="A free library for encoding X264/AVC streams"
 HOMEPAGE="http://www.videolan.org/developers/x264.html"
-SRC_URI="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	EGIT_REPO_URI="git://git.videolan.org/x264.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="custom-cflags debug +interlaced pic static-libs +threads"
+if [ "${PV#9999}" != "${PV}" ]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads"
 
 RDEPEND=""
 DEPEND="amd64? ( >=dev-lang/yasm-0.6.2 )
 	x86? ( >=dev-lang/yasm-0.6.2 )
 	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )"
 
-S=${WORKDIR}/${MY_P}
+if [ "${PV#9999}" = "${PV}" ]; then
+	S="${WORKDIR}/${MY_P}"
+fi
 
 DOCS="AUTHORS doc/*.txt"
 
@@ -29,10 +48,11 @@ src_configure() {
 	tc-export CC
 
 	local myconf=""
+	use 10bit && myconf+=" --bit-depth=10"
 	use debug && myconf+=" --enable-debug"
+	use interlaced || myconf+=" --disable-interlaced"
 	use static-libs && myconf+=" --enable-static"
 	use threads || myconf+=" --disable-thread"
-	use interlaced || myconf+=" --disable-interlaced"
 
 	# let upstream pick the optimization level by default
 	use custom-cflags || filter-flags -O?
@@ -53,8 +73,7 @@ src_configure() {
 		--enable-pic \
 		--enable-shared \
 		--host="${CHOST}" \
-		${myconf} \
-		|| die
+		${myconf} || die
 
 	# this is a nasty workaround for bug #376925 as upstream doesn't like us
 	# fiddling with their CFLAGS