Add opencl useflag and disable it on snapshot

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

5 files changed, 22 insertions, 13 deletions

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index 4af905414b01..f58fb7b9364e 100644
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/x264
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.97 2013/08/12 15:27:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.98 2013/08/12 15:54:33 aballier Exp $
+
+  12 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-0.0.20130731.ebuild,
+  x264-9999.ebuild, metadata.xml:
+  Add opencl useflag and disable it on snapshot
 
   12 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-0.0.20130731.ebuild,
   x264-9999.ebuild:
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 2e616db416d9..a42f2b59e73d 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -15,14 +15,14 @@ EBUILD x264-0.0.20111220.ebuild 2289 SHA256 edf89ceda65eab31f55d66385245eee6481f
 EBUILD x264-0.0.20120327.ebuild 2369 SHA256 652c96142181d3339fb820c0add88ebc21646daf74b24c3bb9b1eaa88737dfc1 SHA512 f90c9af66c75d4f445f1a7443180b8bc4885b0b6be5c64d2c13633ee2094a76dbc74dc33241fd03bba5dcba293df130d45aeb918d8d0b131e8912918583b06de WHIRLPOOL 029fd0b95c4b29e36b6e3cd01671dee797a999631b4a0c086606718295a41ee1c92f667a75d29b1556e2d62a69fd542c323461350f32ff3537ad5706f43fa71a
 EBUILD x264-0.0.20120707.ebuild 2880 SHA256 c1058ae73c205292a5ef7e6e8afc48293b74258f353f796a11518e9e78c8f60f SHA512 2091ef73ef17a7fd84ddf41e03593f0b224c1eaa8be8a6e2410ec3352a8146b19e9e89bda5c9d5fcd3a6d9306b126bf96a32f196288b2aab7c76deb82ae8d82d WHIRLPOOL 0ec1b5c56d0e5af2fb285f2f6d662e73e0449ee0a1dcf31fe2d54c82cd26d9bde03f5ffd95ad8350fee1b5de9552663d553a9ae8b87115bfecf2652a4bd1cb9d
 EBUILD x264-0.0.20130506.ebuild 2303 SHA256 0087e7edbb66caa01bddaaee8f5ef50ce4d17cf0265c840f13967acfdd358bd4 SHA512 c98aae7c6f938a6df1d238295b710bf035868c55c4797f0c87ed90dc47ab5a5a3deba640fd2e63c3931ed53a6816d1164c7a5a77aab1a1fcf98d18c5e4ca735f WHIRLPOOL 5792a11a81c61c814c6b0e644dd381c0e3f832dfb1c4c844a2e606cadaaa8d8cdced3704fc6251350234a5b7a59c806c689f942d30259a22e386147d315171f9
-EBUILD x264-0.0.20130731.ebuild 2088 SHA256 fed4486629a7515806f317e34619dbaa6a6e215420a09f2f2b3f32d496e49e88 SHA512 b15852f1caa2d5743c192b0e8eddb72707e5c8ed79f6f4ed18b705fd381b50eed5dd7dcf0ac98e70dad7a099fb82e83ecf4abc2fc5ce007b49c1994d86516f34 WHIRLPOOL e892afafa84aaf26491fa26f9adea2fd8583f589473736c967d66345b0a1ce5b6da6002a3cd5495ac11b49981a4ffc2f8d55b8a0ad3e0b7671ae0787da39e048
-EBUILD x264-9999.ebuild 2081 SHA256 96d84c2958c2283e815f77fe900f07e489901c32d25a365d64df6a948e95edd2 SHA512 076c1ce301e483eb3408787baa2f4687a3fa66c671c2fa2c4d640a8b0de237b8895baebe3ca41435981b84267fb0d0206b7db91ada06f3d42548d751fb5a9d0d WHIRLPOOL 3709a7cb5e71ea2e5126fc1c4219bcefaae98a51416412e0ece92768d0aec20955d10bd5f613bd3da7f03bcda07b5b2e2052a802e54ab9c08d4d34d0055210c6
-MISC ChangeLog 14556 SHA256 e519c068e09587412affc52c1f2958659334ca469e7e4f60ebba254c4e008ae7 SHA512 6e8f45a1b4f5153e7ff16a816827bf119a594135815589662f13f1f5980867f75cefa445b917e10603c7203ceeaf6f2e60c8576bc7fddd53efdb4bad24976efb WHIRLPOOL 1d4c2565c566401769b3a8ac150eddada196e1f3d43f1ff5c4d8b7dd9e6152467ad89199f3c137e6995a696f98d83385ae5521928dca6307bf83ca84127f2498
-MISC metadata.xml 554 SHA256 0e6f02e5e6503d39334d4c0e02fd983b554af214819ddfd9eb24dea6dad716f7 SHA512 db986ff0e3509ca49278e8bc4f5a8b4866209e8c49f8fb49724f28ac6e42f8d863ca73a0337945c6344054ce07965a08b86ba6f0e34c9cc6dad5217e8309d1b8 WHIRLPOOL 38de13fe7848bc1b20eef69935d8a8bf575bcd339a5f77ef8724ff74e2ff700fa6ddf85544c33a27c0587f3cc541a49a98ccf2298b94f6a22352168102d0c3ea
+EBUILD x264-0.0.20130731.ebuild 2109 SHA256 041e48b5eae405243ce1eac867655b6f7bccd30d32bcb73ef5931df6ebf941c1 SHA512 19352cc333fb8aeca45cc055c4fc5fc9e026e83d4d4473f8ba4606e07ca4d3dd565b5538c85d7e85390d9753484e7784dde08502388438439f4dde9075ed746e WHIRLPOOL a5a1f0a0048555ab4d5f9af9ebc391fd285becaa466342ad746498f903b591f5aa225fe02e10b48de2342f1e91069e8bba15dc25e922cd60e50f931b6d1ae7cc
+EBUILD x264-9999.ebuild 2184 SHA256 fcb1f5d43459df8a0d459836c82a2e5174deb325cc7214187d178712d6bda769 SHA512 fa7f17583b82f534055e3b052406fe2f35da90de46e28fa1c68d4974fbbc5ccdaf9922d01ce1168eb1bbec57b3cb12717da2a43eba942d5c7a678e54be93c5c2 WHIRLPOOL a7dcc5806e127221abd469197f44f86b324f971f31fd0f7166df81ebb3ec3dcfb4860a5a278f6a167c5b4877ecf03ab4634ad19e997bc7955c4466cd9bb2a0ed
+MISC ChangeLog 14717 SHA256 13fe32781f75495277b8844682c837db7668679cfa3b35effa8a9c9e0da22c03 SHA512 69ca788cd3ff47c339824eb38e52604a0112cfa40d364a7840e34d1eaf2eed0b6c072c5eafdb831740a268658bf5431b8f2580d428036cffdf2c904edc2115b4 WHIRLPOOL 99b7148e025a16d6d808398446412d44348b57bc4f2b595bdf9d9a009a6f3299d11d0354fd911ac0e60b615cfd071e6087c47da5ada2c85714664db97c944bf1
+MISC metadata.xml 606 SHA256 175feae20fc3d84511ce15a469df3ccbd75c02fa75eef9d5ad7c3d5c6c3fead3 SHA512 3ee5bd067211cb998771e58ac79e18a9cf7e87d2aaed48b4f766d226ccac3b74199934e1f911bba3389b16ca28661a9e04bbf7fa65069a10682c0327dc4b4b4b WHIRLPOOL 6637b3208323e2eee0dc64572659b6841e29a45232dc3b2209aa4c0b723a39fb75953209da958435510abbbc377b5f36d8890918600dbd837fa553a413823e1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlII/skACgkQvFcC4BYPU0rqmACgjZyjeoFNTWpm4PiaY0oKBVlQ
-DYsAoMBF8FOa5xmc80J0SSDq/HrTUZXF
-=p60z
+iEYEAREIAAYFAlIJBToACgkQvFcC4BYPU0ptjQCfUyhTPl32zA0+20p6GfaPWOCE
+a0sAoLoDRGlvga0HEDtUAEBi5FuW04lN
+=le3U
 -----END PGP SIGNATURE-----
diff --git a/media-libs/x264/metadata.xml b/media-libs/x264/metadata.xml
index 95574e6c8058..4854bbd25485 100644
--- a/media-libs/x264/metadata.xml
+++ b/media-libs/x264/metadata.xml
@@ -8,6 +8,7 @@
   <use>
     <flag name="10bit">Set output bit depth to 10, this may not be compatible with all decoders</flag>
     <flag name="interlaced">enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>
+	<flag name="opencl">Add support for OpenCL.</flag>
     <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
   </use>
 </pkgmetadata>
diff --git a/media-libs/x264/x264-0.0.20130731.ebuild b/media-libs/x264/x264-0.0.20130731.ebuild
index 480268ac815f..ec29e9bfb3be 100644
--- a/media-libs/x264/x264-0.0.20130731.ebuild
+++ b/media-libs/x264/x264-0.0.20130731.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20130731.ebuild,v 1.2 2013/08/12 15:27:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20130731.ebuild,v 1.3 2013/08/12 15:54:33 aballier Exp $
 
 EAPI=5
 
@@ -64,6 +64,7 @@ multilib_src_configure() {
 		--host="${CHOST}" \
 		$(usex 10bit "--bit-depth=10" "") \
 		$(usex interlaced "" "--disable-interlaced") \
+		--disable-opencl \
 		$(usex static-libs "--enable-static" "") \
 		$(usex threads "" "--disable-thread") \
 		${asm_conf} || die
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 270dbffa9865..6664771ae17e 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.15 2013/08/12 15:27:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.16 2013/08/12 15:54:33 aballier Exp $
 
 EAPI=5
 
@@ -23,12 +23,14 @@ SONAME="135"
 SLOT="0/${SONAME}"
 
 LICENSE="GPL-2"
-IUSE="10bit +interlaced pic static-libs sse +threads"
+IUSE="10bit +interlaced opencl pic static-libs sse +threads"
 
 ASM_DEP=">=dev-lang/yasm-1.2.0"
 DEPEND="abi_x86_32? ( ${ASM_DEP} )
-	abi_x86_64? ( ${ASM_DEP} )"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
+	abi_x86_64? ( ${ASM_DEP} )
+	opencl? ( dev-lang/perl )"
+RDEPEND="opencl? ( virtual/opencl )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
 		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 DOCS="AUTHORS doc/*.txt"
@@ -64,6 +66,7 @@ multilib_src_configure() {
 		--host="${CHOST}" \
 		$(usex 10bit "--bit-depth=10" "") \
 		$(usex interlaced "" "--disable-interlaced") \
+		$(usex opencl "" "--disable-opencl") \
 		$(usex static-libs "--enable-static" "") \
 		$(usex threads "" "--disable-thread") \
 		${asm_conf} || die