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

6 files changed, 37 insertions, 36 deletions

diff --git a/media-libs/avidemux-core/ChangeLog b/media-libs/avidemux-core/ChangeLog
index 41c7bffb5bfa..4f36a8c6422c 100644
--- a/media-libs/avidemux-core/ChangeLog
+++ b/media-libs/avidemux-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/avidemux-core
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.24 2014/12/12 09:23:52 pinkbyte Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.25 2015/01/06 19:39:11 mrueg Exp $
+
+  06 Jan 2015; Manuel Rüger <mrueg@gentoo.org> avidemux-core-2.6.5.ebuild,
+  avidemux-core-2.6.7.ebuild, avidemux-core-2.6.8.ebuild,
+  avidemux-core-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-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index b362e1756884..067ed463c3a0 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3 WHIRLPOOL 0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
 DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
 DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9 WHIRLPOOL a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
@@ -10,20 +7,9 @@ DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc2
 EBUILD avidemux-core-2.6.2-r1.ebuild 3898 SHA256 56d329e732b886ed403e8d87a16241adddd25e5420f5d0f389867b5019152e7e SHA512 04337c6cd839cf658021d71c44ca45adc8ccd5fcd2a60a64708e5fb8cdf7f6846550a7cb2e3b6bc762062efb7258d6dfd3b00d34d3072f78507fcef931e098c2 WHIRLPOOL 07f216e71aa3bc21a4747a3377f087371b5da6d240963cf68b2683eaa49d08cb474462b8be96e0dd26b73324279d92e314351393d06b731c9b04f0f60b14135c
 EBUILD avidemux-core-2.6.3.ebuild 3279 SHA256 5d0b858c4970b19136a3da5d8e0d3bc1e249f82615ce4343d7c96fb1b66f1ee3 SHA512 97df89e479fdb4aff19b0797a385a308efe3e24757e4f4eb1388b069c69e8049dd2f2e02b0f374c80e5fbe89eac8c3752cd56d601e111f5c70254eac61562bc1 WHIRLPOOL 04e68bc36ce1a028cea86151f53bf8ef6f780d3a3c339ce9bd947ef00e9ec82ad48e58264035bbe64ed513206517c2615069e62fa0950fe6467360ca82e2bb4f
 EBUILD avidemux-core-2.6.4.ebuild 3251 SHA256 006d813cbdd1befdcbe34425fed4546f7e9f92a185460768f63433bca5146a9f SHA512 a977ba19f61ca385bc6d539517fc0941c978ccbeeef3590ca766a9565149c12bf898b77c1c3c1aeb5dfe849139e4a3f2209f191b6e3259b7878d4ef026bc9d87 WHIRLPOOL e0d725156ce99323b329b81eb64447e9507d2e64d732598cd430575744ce0d4ddcba140e24d7062abc460a9c11f237927e3999a182501c5891a2f43ef2b9feb7
-EBUILD avidemux-core-2.6.5.ebuild 3253 SHA256 28eeb0ee27614f5fb6d8600510d28fe8e8a5429aa83a964170c8b7d26644b2f3 SHA512 d316383fdc49486e7881aa808ec9f8ab52fc856b8e1f588df1a718831de1d95461c8f83fd7c33a840aad19752933ae6704db570f6c56db3908b3cf26f7d92eed WHIRLPOOL 3384ea5630be7e01cbfe4eead1203c766131ebc73c09c7860c6e9667bf66e2c74f48d99317ad9caa9848b4d02a52c032a4d9ee7bb78e7fed7a3255d0c31a51b0
-EBUILD avidemux-core-2.6.7.ebuild 3262 SHA256 40d382a7e88de5fc6d810df357ba636b69b2915a54b53d53a8bcc95ae7155565 SHA512 25f02f4f8c63c0d348f7868351aadbbb53aef5142c9018726ea94a6c56d77b044fb04c7959214175eb5bfbdf28dc8a97e790577332c267834fcae99accffe2f1 WHIRLPOOL 7f1056387660346fa193144d5d592108a2064db8902e88299be54fd037b29e3608c9943b9a997801ff9dbff7356d673803066a150cb8c37ad42a698f4993d28e
-EBUILD avidemux-core-2.6.8.ebuild 3262 SHA256 c80653097e5f578d07fe2440861a7dad84e8af593645a916c09a082348ce1e0b SHA512 3f57f8996732b64bc2b42390bafc3a34502906aa1323e5db94c88e4307e464ece9a2e73c02d37e314f375a035d7561f2884a1ca251408afd3386b932d94d0a7c WHIRLPOOL 622b9a56d708b7db97b01cff49a9ff105f489b9304a4481151b87c5d09b8e002cc1e4da91adab321f84eedfc77cd0e8691833add1b4f5204212e5fe6407c619e
-EBUILD avidemux-core-9999.ebuild 3261 SHA256 1453583d8ca47e330ab755b31c1852e3d4ab707daf2d5923ecca80ef3391d41e SHA512 83799ade029449c77af9a48a44757703f49fb8be9821cf7ac74bce065117f0b2a3fe578bb95bba88e1f863702b3d927f5e6c18a06e1cb180bbbd413cc3367604 WHIRLPOOL 1ced883f7c4629bbb6f1527dc673a2bbcb1412c06d985ec24859b7dd28ffe49eb3c1d14d48a2f77662636cb17ce549907f47b26fb18bf6435d855b34dc5f081a
-MISC ChangeLog 4457 SHA256 4278f44f4f4e96406f41fd5b256af70db1b2e987e9fc393f38381f36b9603a70 SHA512 cc17bdc9572c74df50e219f8e43fc00976d54260e9acec1681e6c684b60eb86349719472e573881630c420733ba54636efacc9820c44a4ab88c0fe9047b99b93 WHIRLPOOL abb50cb46c2b20e35f427c11601e7db1c26e6293c2a96e913d42092063f9d0dd8ca073cbc915813d9a0856fd7cbc2477831213b5cada6e18d0ed84c34b741036
+EBUILD avidemux-core-2.6.5.ebuild 3300 SHA256 b38c193c67d76a1fa36f6cea4d8307fa647d00d0ac42ab5cae40872078d1f3d9 SHA512 b42c1797b571db9d37d5edc79f432bbb4aaab9b40d42d2d220c3c7dd337c48d558c60cbd0b55cfaf441aa608573382c348081c934a0c3c65df74b0c81e4d7dc4 WHIRLPOOL db3ddd84eba6651b65c1518ca70a3fe64244cd8def1c10e9519c7570ad57ae94e4b627dfa9d25a51bbb0d4db8bd0dfb09c0caf9944c911858ac2db0560b44356
+EBUILD avidemux-core-2.6.7.ebuild 3309 SHA256 ca501dc78affce3645291290cd0d1d071ec7053cb3d78bb178107e99c258bb8c SHA512 a30218b29de5d210e1bf5324dc0c516c8d227562c7917433a56cdcb1c4a736ace592398514c4dc85380b92ad62a9daa017a6547f82b373f59b70e374ecd6f266 WHIRLPOOL 9e7e7da4b6c8340edc1f153a6a9d3130afce0cd975ffa5bbd1bd3e938dfbf24434c65bab64cd3741081ea4a0d8063b9507ea7ce420b262fe49d97237bd7035f7
+EBUILD avidemux-core-2.6.8.ebuild 3309 SHA256 b47e4d67bd7c4a5dab180833c095cd7614b946535e429eb89e8819edec9b46f2 SHA512 bcf97c65e6748c23090276043871dd7c099124d5b946ebe0396ddffb0f2cc06705cccbb6041f2045f2519044710adcdd6248205cf4b1b39abf60104a6f7a197d WHIRLPOOL 3696d7b1eac07b29a940fb19221bf1e6d309f6ca02c04c161b81105c947134326b079e6fd03ee9a7989f2836e63ab4396083c56ddca22e7fdfa9b7338fc82ba0
+EBUILD avidemux-core-9999.ebuild 3309 SHA256 50f1b8e60c765fe0c07441718829426e47eb2db5cd461e37c5fb180f4938dc37 SHA512 dd236fc8eaccdd617cf97ccc71367bf5423a041d7377eb961f4aad54a761f6277ec97432636db3fe013def7b5832c17a5a23e4bd4ef1540da6aff2481c76fc52 WHIRLPOOL 88d7ff9c5327584a521ba1113aba5b830806ac0d852f5ca57f59708cadb9c4fd125bae4c4067795a39babe8e36afc4c70622eac1506bb993c331a1a14e71f4a2
+MISC ChangeLog 4710 SHA256 411e80ce0fe5120c82d1b7aa1552f8af919aee100575a34c15e7bc429b53b447 SHA512 b9270d3217fad52eaecad59a890f234751193351a4850d9f06fca664f133d53d8063c04494c843dc2040c7368a638070a5efd8cc7c652a4eb34cb7a90d2cf7f1 WHIRLPOOL 5f0e3f8270b09ca2989cac57177bef4e66dfe27b81fbaebc7954c4d1bdd9a1be55db561d7b07f2aea97ca23d175d52a25e1582b79cb088c9fabdf7a827c8c294
 MISC metadata.xml 436 SHA256 c65fe3135372d64dd3ed901279b93c6865f8572ed9794c6867fd5dea14d4253b SHA512 5bf1bf809c5ce64827cca1aec7c752f853bff627fa75ac5dfa2db53ff1ac0553270346ce88888a7d9340735669e10bb0d0fa284e4ee7438d056b9bcdbc0efc9a WHIRLPOOL 21490eb650b127212b527fdff9e8dc23f83efdab96886f4950a0682aacc172edc9df91928beaa1639a9acb9d9f15eec28730188ff02562c28487c1203888461d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJUirQoAAoJECo/aRed9267eGsIALnvzNWsBwzYgy4N4zW2LrtB
-ctPsdjlp/v4rmJcQ2jPxFfKDib9L2SewNzPtBk1NAuGJADs73PoY7HuzyP/37B0z
-Kr3ARiVJRmBqxfw5cFLwJdNBP8Mox1fEKObMgRX6pYHU2iwaeEWEJjTmIYS6GF4z
-Fo43mRUsh2udra3DHmN7HQZud5ixEmJmabFI/sdUTzzW3dpGgfEfCR7l07jvObUk
-irR4Vm9C2d/p7OL/2tjcMie/Tu09ueY/M24FDiGlSwy/6hLlA/X0OIrsemyf66zP
-JTRi2027B0zHZjU99kMYJvUx+ydtcR392BEolH0sfljHQkQI9jaOZykt/snmieY=
-=KOBM
------END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild
index 2730d00fe428..9d9ac3af823c 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-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-libs/avidemux-core/avidemux-core-2.6.5.ebuild,v 1.4 2014/08/10 21:07:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild,v 1.5 2015/01/06 19:39:11 mrueg Exp $
 
 EAPI="5"
 
@@ -36,8 +36,10 @@ DEPEND="
 	xv? ( x11-libs/libXv:0 )
 	vaapi? ( x11-libs/libva:0 )
 	vdpau? ( x11-libs/libvdpau: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="
 	nls? ( virtual/libintl:0 )
 	$DEPEND
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild
index c7edd381c097..388e875e6a4b 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-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-libs/avidemux-core/avidemux-core-2.6.7.ebuild,v 1.4 2014/08/10 21:07:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild,v 1.5 2015/01/06 19:39:11 mrueg Exp $
 
 EAPI="5"
 
@@ -36,8 +36,10 @@ DEPEND="
 	xv? ( x11-libs/libXv:0 )
 	vaapi? ( x11-libs/libva:0 )
 	vdpau? ( x11-libs/libvdpau: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="
 	nls? ( virtual/libintl:0 )
 	$DEPEND
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
index 59921c88f1d9..2906c2ab899a 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-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-libs/avidemux-core/avidemux-core-2.6.8.ebuild,v 1.2 2014/08/10 21:07:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild,v 1.3 2015/01/06 19:39:11 mrueg Exp $
 
 EAPI="5"
 
@@ -36,8 +36,10 @@ DEPEND="
 	xv? ( x11-libs/libXv:0 )
 	vaapi? ( x11-libs/libva:0 )
 	vdpau? ( x11-libs/libvdpau: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
 	nls? ( virtual/libintl:0 )
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index ca844efbe2e0..30d22d29232b 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-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-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.8 2014/08/10 21:07:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.9 2015/01/06 19:39:11 mrueg Exp $
 
 EAPI="5"
 
@@ -36,7 +36,10 @@ DEPEND="
 	xv? ( x11-libs/libXv:0 )
 	vaapi? ( x11-libs/libva:0 )
 	vdpau? ( x11-libs/libvdpau: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