Update xvba dependency to use bundled vaapi in x11-drivers/ati-drivers. See bug #534710

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

7 files changed, 44 insertions, 42 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 8db4229a6f15..5038ee468615 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/avidemux
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.231 2014/12/12 09:43:30 pinkbyte Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.232 2015/01/06 19:41:55 mrueg Exp $
+
+  06 Jan 2015; Manuel Rüger <mrueg@gentoo.org> avidemux-2.6.5-r1.ebuild,
+  avidemux-2.6.5.ebuild, avidemux-2.6.7.ebuild, avidemux-2.6.8.ebuild,
+  avidemux-9999.ebuild:
+  Update xvba dependency to use bundled vaapi in x11-drivers/ati-drivers. See
+  bug #534710
 
   12 Dec 2014; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   USE='vaapi' is now global, removing it's description from metadata
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 472c2a8346dd..0342f20fcf7e 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX avidemux-2.5.4-build-plugins-fix.patch 497 SHA256 a470bfa50d86082f4e9ad31c5be630efe9a237f8dd504058278968770635ecef SHA512 f6023e1252463abeee7495c4fb034077ccd21f731c32b0cbb57cadb4880fd68d46a81220fb6553d1bf5af3eae4874adfb13ac17b06c5344144c04bffcf6791ee WHIRLPOOL 86d36e2e9f80623f314352639868d25d19899625424c7a09192a6639877a9acf666c5e9a04b690f5e7b784ba70a580a76988d5a2fd605df375b7bbf096310489
 AUX avidemux-2.5.6-ffmpeg-symbol-visibility.patch 869 SHA256 0ed5a1296fbe20f001657ed63dcbf758cf88aafb75a451c37513b825864956c0 SHA512 57db2ffaad2b4ffc46fac8f46810b1cf028013045392d1633f6e25fc65be6401fd0b5fc0991d09403d6dac39b8aacdf06f966aae70d97a53653ddc1aaa95a9bf WHIRLPOOL 093eec35dd59cb4165527bde0d2335e1ec8a88d1f8ef5cb4e51e88f6ba25204cdf645123b55204f1a8c15a3d066c5eb95f4c4ee24a6af22693a9f8e4b9378c2f
 DIST avidemux_2.5.6.tar.gz 14914123 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b SHA512 8a9dcfc61a396fc4f9f0a213269bcb574de0baa442d3165cfab0fe8e86309e7b0dd2ffe3e2d7ff8a8e6e3fd15da28699e8000367d92da0782fec6d5a38c1d77c WHIRLPOOL fecca87889b19a321a9fe13e734ca11a883c88152e5d59926ecd423b178bb26ef611ee00d8b2897f8a4a36a5c159d6c9f32733bc98fccced08532b8f060bd6ac
@@ -14,21 +11,10 @@ EBUILD avidemux-2.5.6-r2.ebuild 4404 SHA256 1c98dbcbea05878eb4e82624fff39e607400
 EBUILD avidemux-2.6.2-r1.ebuild 4001 SHA256 952f94f38505c251e25c65ddda7f85bf51ae21fc90c78b05d85f0f2c44d4c596 SHA512 fc00ed4467953e886646e905a022835d0d81dd62ab00517df7967815267edc52c0b4f0003b89650bccb91f19ca65be6966a59179a0d667654fbee106e545f1f0 WHIRLPOOL 5e2f90803baadc59d10bc2e7ace8bd81a893c65b16350b9bd6a98361d854013ccf30f19c03f5510159b84a97c0fe3d0076a0f42f533accb81f9b0b456f565c44
 EBUILD avidemux-2.6.3.ebuild 3454 SHA256 561d8109f9c0ec6cbe89e8f6a40adbd3bcc6cbaf5991dae3d44571190a83cefd SHA512 9385cb523e2215445321ff842f8d8415dda93176579ef4cdb2a29602a1be7c05f69e7edb6b0e6712bc0faf5d51af2628f349d371186eedd2230f6f1389e31be4 WHIRLPOOL 4d520d6d3a8f2f87de9cd17ce993e887b78127821250d1d2326ddfbfbb70ac51916d1c2a377c189cc98a71b5c5ce5ed7aa1ccc6c8de42d3c9255e8a35dee05b0
 EBUILD avidemux-2.6.4.ebuild 3435 SHA256 2f9d3dfaf5af5447803a490561a3a6bfbdb45818161fe6c983b9b8904f289b8e SHA512 8d8e329ce4cea70c3ea07f9b5d0b34bdc30cfaaad028e5e04e2385e24bea3180ebc640f47b3efd2a0e248bfc48d33f56f05608d0ba6406a52c6a694d98cb25e3 WHIRLPOOL 3d2c4c8709aaa2136ee0a64e00d3f8913188010844ccea6c66ddac314a9e990dd8355a9ff6ede5aac83ee039c65529c1996b9fe33fb816c678e612aa09b74745
-EBUILD avidemux-2.6.5-r1.ebuild 4092 SHA256 ec6f4af8978f2bf70c016d03105778521ca176745154f3ab8f7311908300472d SHA512 82ac0df04b046e85991932f03ac4ca1ebca74472a674533d86559ba6a50736e203b742211fbc036676f4345a0644dbcbc9e267b79e58676ec1599d9bd4ca9712 WHIRLPOOL 90b5f09a95bf482c8cef18775fc42d14d50f9f3498460ceb0dd0f0d375d5c03c6a8b93711a5188d697c8e122c318aec78de5441ed81f926d81e8f88ddfa5bf54
-EBUILD avidemux-2.6.5.ebuild 3817 SHA256 0948d3702b0680984e1e04175e8caaf1d5163b832d0513699a39ecc84e579e9f SHA512 a982f87f98bc253af1d295d71bb2513b5c28042d0aa32f025b4025d22d9cd01faf6a9887acbc7cb9eb3ea8d1e56e1009067cf169d9cdf7e4a1de8463bb1bba87 WHIRLPOOL 179122a6dd5056610e96da5ec1f8813b2925ec994726db59bbfbfc4762af7cc5c0ff56c6a16e3668bc63263cbf23b8403314db2c40bef5c8bca99774b2c30f3d
-EBUILD avidemux-2.6.7.ebuild 3823 SHA256 137638640dc4eb758bbcdc4578b8b81c2f2846a7a86ab30f5ea48635ccad2c60 SHA512 b180bf31c2ab2945bf592d94920b7399f9a214c7da422987906a663c726a95b7d7a51edd2546ddd1e433a190881c6fb5d4df462b42c86f2c73c1af7bff35fc3c WHIRLPOOL f3da8d3e3817b6c46380a027db97dbebf6ca4fe4039c04b74eb6f4ea4ba40d79e0e37a60dd1f267b0a8c6bbc744e957c2f26859d354f79157403c66032807aaa
-EBUILD avidemux-2.6.8.ebuild 3823 SHA256 eb2560d583252d2f116109e7ef3bfd4b66e9fdbecd314ecf051497c86643c8ed SHA512 b9e665d265962f96598bbeed9a3cf3cca46677c729ae0b5e81dfa5d823bd20c173162d612b0ef2b1c8a73a5b7a6c5d5bd3cf28970db76bd50b84b1494b1107f2 WHIRLPOOL 1460e953a206b5a192f8dcf3a4978e61fc61636de8fd40ba54adb0da8977c306763d91cd8952f231745c558527b1a8db2813c7540983791859e19fce74fe0bf6
-EBUILD avidemux-9999.ebuild 3822 SHA256 4bf3fb2cff7073e7358d284f32fd591dddad7377ae06ff39d2b0d1e3bd4ffad3 SHA512 027f99d4a1800948eb32d1d76d087f413af3f91a7100b39c395bef84d1acd6e57d28ec57a73ee9ae67e01e03c7fc3f0064f70a9633dd96b49d4a9b0d5b8f93a7 WHIRLPOOL ef5d5e0de53fbb9cd9abeca76b06b91169f1ff6aa5db702812f53e07eeadbc6b996bafb4c957451bc65920403c649260d16025bd70298d824a1769c6e01975fe
-MISC ChangeLog 43137 SHA256 ac73e83f542143e25a259eb01bf0a4d4221edd2a5ab3d6cd2ddae6b4382b3dba SHA512 d8eb6431610c378d510e4c575a0b758779cef25137cc38c1b0b85f64de3ef4757b3ca85cca2015d43eb268f2fc89dc7cdc82ef1388c0f80ac9de6a2b305ec4c3 WHIRLPOOL f12bfe94a3364f01cffd8f2755200e7e9ab7b0532c21bb5ccce936c07df9dcf15c5077ccb3f697b732938a73a20d27bff43a3d698381ce9d184ff82749dd58e9
+EBUILD avidemux-2.6.5-r1.ebuild 4139 SHA256 7b183fbaa2107f0c50273b7bb9b596063b4dd0eb674d2699a49fc8df680ec212 SHA512 e66d4cba76922db2060e2fa5ce4576caac80b5509a5ff73ab44ecc90531d82e27074996b06f73b4ce8768af13f99cf9188b9f8d05e0ce2c53647ece95262f870 WHIRLPOOL f0753df4ffc6e33baa822035d07b62f13ee60b5f65bf5353dc8a8a7eaa83a7edbc4f4fa1f568bf53179b320bc02aab7939ffd7f94e3edffd1305ed831a735fa6
+EBUILD avidemux-2.6.5.ebuild 3864 SHA256 8260a90c6ee88c02a8cdad097a5cd7b0ecbd5f70a3fa349c8ab6d0c99c79854c SHA512 ef8082c1ddf3a19d2f4b60bc79a0f1d5a2d9805ca476100197e5de4172b4dba7ea40efdcf5e709c30d1ab6768c5d4db12223c3b332bb3a30c0135c774a76e2ae WHIRLPOOL 9e736139e99b5e22da4b80643965b78e59a6cf5d168400b41f5082fc3370b4fb77fd16c2a0bf2b46a13d956ac518d0467108df6e8b6ea973d6a13addebb48618
+EBUILD avidemux-2.6.7.ebuild 3870 SHA256 084d6093cc296cc6f0ed4c554959a6a48d42ba6a6daf8526533c5797027dbefb SHA512 70146bcdbe6d15dbbbf6187ae2bd475aa33565ef4228fa045a661dce39e635da061ff9e426ea6636ebd75ae9803431f3b108fca0bc922ed0740650ea7196b656 WHIRLPOOL 8f7aa04a7085415f651a4010b5c1f72ac49ce9d57d4c62ea938db0f160b7a534969ac421fdfbe8bbab6a4d31f45379851d486825468c4b3bbbdf0ec556dfeff7
+EBUILD avidemux-2.6.8.ebuild 3870 SHA256 6f178659bb4d9480ce3bc3cf72950393830291ba3aa6812b1b3caa8e3acfd035 SHA512 e86b77e163590d33d644308d0f95e6795e5cc894f6df6233d254cc7adb254f72a1bb601a453ae590fee712ca7fed76266b7e610648bdbe1ae8ff5e095adecb72 WHIRLPOOL 4639aea32734eba0cd707f25d3b52b395a5e7011fa07878f82d29c724fff59a5aaba0a8189fd1e7b925b2f150cbef70e6af73c36c36cd30d4a962b1b7668f2b8
+EBUILD avidemux-9999.ebuild 3869 SHA256 a0791be4f7c08dcb01e54e984c70ced4c9710c02db012e8fd547949cd0bda2ec SHA512 c93d095eec3cc01ef4ddac97673153ff448b3b6092231b9905c3670b300e53b892fa40545b3c456b32d82c12f966100adfb941511c4f82e038e0ca093cc45452 WHIRLPOOL f322eef8385c392d78af07d6e7b5a56985ab7570d14223c5153c512d3388156a7c8c9fd9d2fcd51fe9333c4e1fc0e0635436412fedcae4990b50dd0a257ddd43
+MISC ChangeLog 43396 SHA256 ff8b86fa3b77faae2d58902693e02be333e8840fc4ce0d80840cb409cc300767 SHA512 9db6fe3d0d7b26417d3ae4d1c49c718fcb8ea79913d47e405e6739cd4bc90252fc63bee6274a1e21280082ad8727cc6ec703bf5b9bd677b1d940de41f3bfa068 WHIRLPOOL 0c0c3e7db4b8e808898ddf4791041e76edf95227f3ce0fb82b80a367a71e9a1ecd8fd1a75e060e7044ead1f15c4cad8783b03dd4bbcb0bd02dfc076fa78db9e4
 MISC metadata.xml 446 SHA256 a2fb3a65488aa37ad428a22cadb3b4fb8266d79ccf88ca52f8cc55359dd196d9 SHA512 1340753b594a425470665d4dbaaa3f59c9115dd0c478c2819e15908f6393e38eedda2c7c313b15acac406ae8ea7496573ac95e6f01284c032834bba717dee0d6 WHIRLPOOL b159ca767728879279c91fb470a93919a27b140087ac6085dd73fc36bc28aad098f65aacb84015677e07ee1b73ae038df64630e73ce1634dc83002ce91036689
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJUirjCAAoJECo/aRed9267dcoH/3Jb775MVeH911mm0HG+Fg91
-qkKu4HYVyNv2u1DMFxxRGWRj6nbYwc9DhNaiLMujWruE9jjYvhewXXb+b2/dxB3C
-bnuRtjA0bP5+CjBZToFJO6iP2XagzoVFjj4mn7uPXBKQ/kYvEDr/TmaQNzR+fG7c
-fZwWaap/a5bM3N6B6sg/6QAZ1MByS+agb3NGC+gApFBPU10uYiK4XoXY4r4ZaKBs
-qo366V6d6r24hbVGQCTy3GnKJJXFq3YPCC2DR3zPqn5xdVc97t6YE3VyyI81LiKX
-tYsbkQ5lY7xZckWoP8KUBBCUU0waIyBEdGASJ5Eq2WozFJx3DSSZjn4weYDRbb4=
-=x0kI
------END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.6.5-r1.ebuild b/media-video/avidemux/avidemux-2.6.5-r1.ebuild
index 7d2494c30c9b..b881ce8135bf 100644
--- a/media-video/avidemux/avidemux-2.6.5-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.6.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.5-r1.ebuild,v 1.2 2014/08/10 20:57:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.5-r1.ebuild,v 1.3 2015/01/06 19:41:55 mrueg Exp $
 
 EAPI="5"
 
@@ -33,8 +33,10 @@ DEPEND="
 	opengl? ( virtual/opengl:0 )
 	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
 	vaapi? ( x11-libs/libva:0 )
-	video_cards_fglrx? ( x11-libs/xvba-video:0 )
-"
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3
+			x11-libs/xvba-video:0 )
+		)"
 RDEPEND="$DEPEND"
 PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
 
diff --git a/media-video/avidemux/avidemux-2.6.5.ebuild b/media-video/avidemux/avidemux-2.6.5.ebuild
index e589f8b4db6d..250aa1f84ddf 100644
--- a/media-video/avidemux/avidemux-2.6.5.ebuild
+++ b/media-video/avidemux/avidemux-2.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.5.ebuild,v 1.2 2014/08/10 20:57:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.5.ebuild,v 1.3 2015/01/06 19:41:55 mrueg Exp $
 
 EAPI="5"
 
@@ -33,8 +33,10 @@ DEPEND="
 	opengl? ( virtual/opengl:0 )
 	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
 	vaapi? ( x11-libs/libva:0 )
-	video_cards_fglrx? ( x11-libs/xvba-video:0 )
-"
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3
+			x11-libs/xvba-video:0 )
+		)"
 RDEPEND="$DEPEND"
 PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
 
diff --git a/media-video/avidemux/avidemux-2.6.7.ebuild b/media-video/avidemux/avidemux-2.6.7.ebuild
index 0a389a5c86fe..8857eea03efe 100644
--- a/media-video/avidemux/avidemux-2.6.7.ebuild
+++ b/media-video/avidemux/avidemux-2.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.7.ebuild,v 1.2 2014/08/10 20:57:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.7.ebuild,v 1.3 2015/01/06 19:41:55 mrueg Exp $
 
 EAPI="5"
 
@@ -33,8 +33,10 @@ DEPEND="
 	opengl? ( virtual/opengl:0 )
 	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
 	vaapi? ( x11-libs/libva:0 )
-	video_cards_fglrx? ( x11-libs/xvba-video:0 )
-"
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3
+			x11-libs/xvba-video:0 )
+		)"
 RDEPEND="$DEPEND"
 PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
 
diff --git a/media-video/avidemux/avidemux-2.6.8.ebuild b/media-video/avidemux/avidemux-2.6.8.ebuild
index 514373af5189..3c540bb2a417 100644
--- a/media-video/avidemux/avidemux-2.6.8.ebuild
+++ b/media-video/avidemux/avidemux-2.6.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.8.ebuild,v 1.2 2014/08/10 20:57:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.8.ebuild,v 1.3 2015/01/06 19:41:55 mrueg Exp $
 
 EAPI="5"
 
@@ -33,8 +33,10 @@ DEPEND="
 	opengl? ( virtual/opengl:0 )
 	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
 	vaapi? ( x11-libs/libva:0 )
-	video_cards_fglrx? ( x11-libs/xvba-video:0 )
-"
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3
+			x11-libs/xvba-video:0 )
+		)"
 RDEPEND="$DEPEND"
 PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
 
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 23bf8a8e07e4..f1b4895d45be 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.5 2014/08/10 20:57:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.6 2015/01/06 19:41:55 mrueg Exp $
 
 EAPI="5"
 
@@ -33,8 +33,10 @@ DEPEND="
 	opengl? ( virtual/opengl:0 )
 	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
 	vaapi? ( x11-libs/libva:0 )
-	video_cards_fglrx? ( x11-libs/xvba-video:0 )
-"
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3
+			x11-libs/xvba-video:0 )
+		)"
 RDEPEND="$DEPEND"
 PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"