From cea69369c4a2d37c00a024f75b871b0f751beed8 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 11 Feb 2013 09:37:42 +0000 Subject: [PATCH] [x11-libs/xvba-video] re-sync with Portage --- .../files/xvba-video-fix-mesa-gl.h.patch | 17 +++++++++++++++++ x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild | 12 ++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 x11-libs/xvba-video/files/xvba-video-fix-mesa-gl.h.patch diff --git a/x11-libs/xvba-video/files/xvba-video-fix-mesa-gl.h.patch b/x11-libs/xvba-video/files/xvba-video-fix-mesa-gl.h.patch new file mode 100644 index 000000000..578d3321d --- /dev/null +++ b/x11-libs/xvba-video/files/xvba-video-fix-mesa-gl.h.patch @@ -0,0 +1,17 @@ +diff -urN xvba-driver-0.8.0.old/src/utils_glx.h xvba-driver-0.8.0/src/utils_glx.h +--- xvba-driver-0.8.0.old/src/utils_glx.h 2013-02-04 20:04:00.476332874 +0100 ++++ xvba-driver-0.8.0/src/utils_glx.h 2013-02-04 20:04:40.228329931 +0100 +@@ -25,6 +25,13 @@ + #include + #include + ++ ++#if GL_GLEXT_VERSION >= 85 ++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED ++ block and is not defined if GL_VERSION_1_3 is defined in ++ Redefine the type here as an interim solution */ ++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); ++#endif + #ifndef GL_FRAMEBUFFER_BINDING + #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT + #endif 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 d5f52e6b1..0e77ade97 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,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -6,7 +6,8 @@ EAPI=5 EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/xvba-driver" [[ ${PV} = 9999 ]] && inherit git-2 -inherit eutils autotools +PYTHON_COMPAT=( python{2_5,2_6,2_7} ) +inherit eutils autotools python-any-r1 DESCRIPTION="XVBA Backend for Video Acceleration (VA) API" HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi" @@ -26,13 +27,20 @@ RDEPEND=" x11-libs/libvdpau " DEPEND="${DEPEND} + ${PYTHON_DEPS} virtual/pkgconfig" DOCS=( NEWS README AUTHORS ) S="${WORKDIR}/xvba-driver-${PV}" +pkg_setup() { + python-any-r1_pkg_setup +} + src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-fix-mesa-gl.h.patch eautoreconf }