Apply patch to build against recent x11-libs/libva, bug #503136. Require x11-drivers/ati-drivers for building, too.

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

4 files changed, 27 insertions, 7 deletions

diff --git a/x11-libs/xvba-video/ChangeLog b/x11-libs/xvba-video/ChangeLog
index 761470a7103a..91ba6c4048ec 100644
--- a/x11-libs/xvba-video/ChangeLog
+++ b/x11-libs/xvba-video/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/xvba-video
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.17 2014/02/10 21:35:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.18 2014/03/03 18:05:15 chithanh Exp $
+
+  03 Mar 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xvba-video-0.8.0-VAEncH264VUIBufferType.patch,
+  xvba-video-0.8.0-r2.ebuild:
+  Apply patch to build against recent x11-libs/libva, bug #503136. Require
+  x11-drivers/ati-drivers for building, too.
 
   10 Feb 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   xvba-video-0.8.0-r2.ebuild, xvba-video-9999.ebuild:
diff --git a/x11-libs/xvba-video/Manifest b/x11-libs/xvba-video/Manifest
index 3593c26cb0be..f77ff1cace29 100644
--- a/x11-libs/xvba-video/Manifest
+++ b/x11-libs/xvba-video/Manifest
@@ -1,8 +1,9 @@
+AUX xvba-video-0.8.0-VAEncH264VUIBufferType.patch 412 SHA256 21a4f9ffd2b916942d651c2a030631418015e6059488e445a4c010e281edf00b SHA512 f01f7067d4b5170729e0c163d8505b086e12f32b5e5a183ca6f862bfe9331daeba4c207927381dac576ec4ae691d89be4e7006e9ab37d1f01253305e0de1ec9e WHIRLPOOL 150d12b9a2952e80e677f52f1a0ff334d2ab1aa039738d2bd0750464c172de94eef01caf321943f4d04cd130d5fc5d8564219438d7fb16c35cddc53a24fc0c64
 AUX xvba-video-fix-mesa-gl.h.patch 716 SHA256 dfca7a791d22baefeb9b0b7e6b7f8baad0d1f1785c35d1e43019b4a9c5949204 SHA512 103b424161c17c82bf02a35008603db5b17059e77937b9a7727517da6c3e6c211023cb62fe09cdd5035447209c8c10ed293879e576b1b5c7bcae303d79536adb WHIRLPOOL 590e52fd91658d7272940d0265d20e28b06c0f0e43d7c0b2f5764751855e6a31671b94c330b734505843873c7cc00a7656a07d7be285ad0c2571c649d0a30fa7
 AUX xvba-video-fix-out-of-source-builds.patch 372 SHA256 5acd2f0c1ee1a575bdfe9c0323627e74c15d75af0a88ab4e514f145a419ddc15 SHA512 a4ca2d2228a3d1f212b9c8d71c8bb2d1cddad6269802d7b969b5e6d401bb2aba64f33c4fd0a6a910c1b0d96b57b10b654304ccc10dca997130208b29e6986538 WHIRLPOOL b78ce8b5a091e299c7d4ab64cc7e932a37541b4a176b0927137b9d48ab8e8a37abb43b09e70c3f9d0a74a038515486d1fbe1c476d6829e3a0cfe21ec2331e694
 DIST xvba-driver-0.8.0.tar.bz2 80424 SHA256 bd56e64c619732956fe3e900520a704de90c1849f0b0e0ab6b8db5ff695d38a2 SHA512 1e968f6123c5563f5dfc1f01cd2b7ed9b3f6afa9cf93b50b2079b1408670f6048f8d6b6d47c1ebbad1defc3600788ddf85a93bee772d90e05a8769ff19e2425b WHIRLPOOL df19706f84c17c6141e9a3cacec230012767b8fb06117477b95ed4b511b52321e9092455d927ff4147b1a951aea234d35575758fd69ba577ade131fb27d79da1
 EBUILD xvba-video-0.8.0-r1.ebuild 1385 SHA256 8e5a99796fae10d8f4878c813c6d80508e9b6aa5cc3aa89185673cbaf391d5de SHA512 91670251bb690dad339446bc9b2289418562f76bddde687c89101fed1b3bcdf40576ca46d9e9e225841d01999d13aa1406c1296e15b95fc00f705059ae91a043 WHIRLPOOL fd808389cb003aaefb26852ee9fb9fa00cb0ad19cf56f6229886c4cee7ba129ed1eae917ab464d5513c43f021fd86215e18203a0e7f81faed0887cd2dd8cd8f0
-EBUILD xvba-video-0.8.0-r2.ebuild 1614 SHA256 f4c81f576bc1a7cd369382d0db56542fdc9f9cad98cb0c72ddd047e9252be32d SHA512 72ed3bf4219e8864d539dd0d7261306cb83251c927fc8d994d468900a3398699b12aa44c2bde87d7075138b9a41f9ec3b1e89dec4ea6c1a172bc7a836968eae4 WHIRLPOOL 3aa8a5ddcbf8ba97cede0ce0789b92933a8f542b88f71c96e5e6a8f427ffb4ca7627afe385b3e172558379203cdb9a83727e518fa7e5bc0ea1a0f0aeb4d80bd2
+EBUILD xvba-video-0.8.0-r2.ebuild 1663 SHA256 553f1d7bb091a4e2a2f4cf0fab29e355dba8b695ca3e2463836ea19bf1427dd0 SHA512 2598155fe2d89ec8b60e9398514ef9860f5999ffd50873682c44c164909db516125cc7754297f1461a22a7cb2e1a181446c6b81efc848a937a8d976bc0e4ec39 WHIRLPOOL 899f7c2b3f9a2f75bcc3adde79a145ad757bf5e12bf6ad3a302d884a469230b986fd9b683623cf62bcf6084db7d11a667e2680eca8de2c77ee6c3bae9df5e331
 EBUILD xvba-video-9999.ebuild 1494 SHA256 52e6370d407568ba5ab7c0e6c1789dc6108158aa2b3825ade3d3653ee62cf470 SHA512 238709abe41a437e05630263e5034679d17ecb540c43488e60a6b8e4381af669ea43243ee76ad271ae8caa84c193badccb6685538adb02c0d81f2197941dc720 WHIRLPOOL ba5a5cd39107185704644b2859722ba16c700f12d396e113eca468d8913a6e1cd3fb849c290892875755d409fa8720314e041d1f1da784a99ebc1f0b4e867cee
-MISC ChangeLog 3094 SHA256 14862a5821162ad066ec8948fa078e94f21c645e60b9d03d17ae5c007b2bea85 SHA512 65709f6a60f1a6ae0fff653c52ffd40b0de6b358cadbaf4e7a7818e396447a602f79bc006281870eb408c8ac7207a6297cdd348a48bb7e0af1b0e0261d4782d8 WHIRLPOOL 65ef465b1f092a88bba53152bb11cfcdfa5b248921c8e8becca3e55ec4bec97da929fbb2340444b26ea63e3152a94ac7f275536fb9a18d77d46cc60294ff5570
+MISC ChangeLog 3370 SHA256 3df59c09a08f36d3508cd7ee50105a1acef5f8db220c92bc5ca4a7a7af259e0e SHA512 f9def3623cd4f7406fc4f0bb66ef7c409f2467f4dee0d95b7d9d359c100521b1425e2b762c2cd266df5cb74b77cd7e167464ac1e5b84b3f5d393549b73bbf505 WHIRLPOOL 035f7955186dfb3e562bb91ed91fe607e1836685710d2e00b36e882166d2e386e90e31ca0a90bacfc05b69a8bc5ff6e5b9f733f80ce3612d42f367e12f496d5d
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-libs/xvba-video/files/xvba-video-0.8.0-VAEncH264VUIBufferType.patch b/x11-libs/xvba-video/files/xvba-video-0.8.0-VAEncH264VUIBufferType.patch
new file mode 100644
index 000000000000..3542d4ee6d19
--- /dev/null
+++ b/x11-libs/xvba-video/files/xvba-video-0.8.0-VAEncH264VUIBufferType.patch
@@ -0,0 +1,12 @@
+diff -ur a/src/xvba_dump.c b/src/xvba_dump.c
+--- a/src/xvba_dump.c	2012-11-23 14:29:10.000000000 +0100
++++ b/src/xvba_dump.c	2014-03-03 18:53:08.772012251 +0100
+@@ -150,8 +150,6 @@
+         _(VAEncSequenceParameterBufferType);
+         _(VAEncPictureParameterBufferType);
+         _(VAEncSliceParameterBufferType);
+-        _(VAEncH264VUIBufferType);
+-        _(VAEncH264SEIBufferType);
+ #endif
+ #undef _
+     }
diff --git a/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild b/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild
index 3f684dff37b0..1568bba42605 100644
--- a/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild
+++ b/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild,v 1.2 2014/02/10 21:35:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild,v 1.3 2014/03/03 18:05:15 chithanh Exp $
 
 EAPI=5
 
@@ -24,16 +24,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug opengl"
 
 RDEPEND="x11-libs/libva[X(+),opengl?,${MULTILIB_USEDEP}]
-	x11-libs/libvdpau[${MULTILIB_USEDEP}]
-	x11-drivers/ati-drivers"
+	x11-libs/libvdpau[${MULTILIB_USEDEP}]"
 DEPEND="${DEPEND}
 	${PYTHON_DEPS}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-drivers/ati-drivers"
 
 DOCS=( NEWS README AUTHORS )
 PATCHES=(
 	"${FILESDIR}"/${PN}-fix-mesa-gl.h.patch
 	"${FILESDIR}"/${PN}-fix-out-of-source-builds.patch
+	"${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch
 )
 
 S="${WORKDIR}/xvba-driver-${PV}"