Adjust libva dependencies in the stable ebuild, bug #517394. Apply patch to avoid triggering an assert in xvba_image.c, bug #499290.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

5 files changed, 87 insertions, 5 deletions

diff --git a/x11-libs/xvba-video/ChangeLog b/x11-libs/xvba-video/ChangeLog
index f13bb6a8d489..fa57f90e14ec 100644
--- a/x11-libs/xvba-video/ChangeLog
+++ b/x11-libs/xvba-video/ChangeLog
@@ -1,6 +1,15 @@
 # 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.19 2014/06/18 21:16:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.20 2014/07/21 09:04:41 chithanh Exp $
+
+*xvba-video-0.8.0-r3 (21 Jul 2014)
+
+  21 Jul 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xvba-video-0.8.0-assert-hw_image_hooks_glx.patch,
+  +xvba-video-0.8.0-r3.ebuild, xvba-video-0.8.0-r1.ebuild,
+  xvba-video-9999.ebuild:
+  Adjust libva dependencies in the stable ebuild, bug #517394. Apply patch to
+  avoid triggering an assert in xvba_image.c, bug #499290.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> xvba-video-0.8.0-r2.ebuild,
   xvba-video-9999.ebuild:
diff --git a/x11-libs/xvba-video/files/xvba-video-0.8.0-assert-hw_image_hooks_glx.patch b/x11-libs/xvba-video/files/xvba-video-0.8.0-assert-hw_image_hooks_glx.patch
new file mode 100644
index 000000000000..7cb249a16f48
--- /dev/null
+++ b/x11-libs/xvba-video/files/xvba-video-0.8.0-assert-hw_image_hooks_glx.patch
@@ -0,0 +1,12 @@
+diff -ur xvba-video-0.8.0/src/xvba_image.c xvba-video-0.8.0-patched/src/xvba_image.c
+--- xvba-video-0.8.0/src/xvba_image.c	2011-06-14 13:07:13.000000000 +0200
++++ xvba-video-0.8.0-patched/src/xvba_image.c	2012-07-22 14:55:14.186667413 +0200
+@@ -423,7 +423,7 @@
+ }
+ 
+ #if USE_GLX
+-const HWImageHooks hw_image_hooks_glx attribute_hidden;
++extern const HWImageHooks hw_image_hooks_glx attribute_hidden;
+ #endif
+ 
+ // Commit image to the HW
diff --git a/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild b/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
index c0d5d6a00ce4..b61c27e47c94 100644
--- a/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
+++ b/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-r1.ebuild,v 1.7 2013/09/05 19:44:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild,v 1.8 2014/07/21 09:04:41 chithanh Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ KEYWORDS="amd64 x86"
 IUSE="debug opengl"
 
 RDEPEND="
-	x11-libs/libva[X(+),opengl?]
+	<x11-libs/libva-1.2[X(+),opengl?]
 	x11-libs/libvdpau
 	x11-drivers/ati-drivers
 "
diff --git a/x11-libs/xvba-video/xvba-video-0.8.0-r3.ebuild b/x11-libs/xvba-video/xvba-video-0.8.0-r3.ebuild
new file mode 100644
index 000000000000..8434ae840fed
--- /dev/null
+++ b/x11-libs/xvba-video/xvba-video-0.8.0-r3.ebuild
@@ -0,0 +1,59 @@
+# 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-r3.ebuild,v 1.1 2014/07/21 09:04:41 chithanh Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/xvba-driver"
+[[ ${PV} = 9999 ]] && inherit git-2
+PYTHON_COMPAT=( python{2_6,2_7} )
+AUTOTOOLS_AUTORECONF="yes"
+inherit eutils autotools-multilib python-any-r1
+
+DESCRIPTION="XVBA Backend for Video Acceleration (VA) API"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+SRC_URI="http://dev.gentooexperimental.org/~scarabeus/xvba-driver-${PV}.tar.bz2"
+# No source release yet, the src_uri is theoretical at best right now
+#[[ ${PV} = 9999 ]] || SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+# newline is needed for broken ekeyword
+[[ ${PV} = 9999 ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="debug opengl"
+
+RDEPEND=">=x11-libs/libva-1.2.1-r1[X(+),opengl?,${MULTILIB_USEDEP}]
+	>=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}]"
+DEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	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
+	"${FILESDIR}"/${P}-assert-hw_image_hooks_glx.patch
+)
+
+S="${WORKDIR}/xvba-driver-${PV}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# bug 469208
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable opengl glx)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/xvba-video/xvba-video-9999.ebuild b/x11-libs/xvba-video/xvba-video-9999.ebuild
index 34a6360f49a2..612446a2971a 100644
--- a/x11-libs/xvba-video/xvba-video-9999.ebuild
+++ b/x11-libs/xvba-video/xvba-video-9999.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-9999.ebuild,v 1.10 2014/06/18 21:16:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-9999.ebuild,v 1.11 2014/07/21 09:04:41 chithanh Exp $
 
 EAPI=5
 
@@ -33,6 +33,8 @@ DOCS=( NEWS README AUTHORS )
 PATCHES=(
 	"${FILESDIR}"/${PN}-fix-mesa-gl.h.patch
 	"${FILESDIR}"/${PN}-fix-out-of-source-builds.patch
+	"${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch
+	"${FILESDIR}"/${P}-assert-hw_image_hooks_glx.patch
 )
 
 pkg_setup() {