Fix broken build with mesa gl.h. Resolves bug#450098.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

4 files changed, 30 insertions, 3 deletions

diff --git a/x11-libs/xvba-video/ChangeLog b/x11-libs/xvba-video/ChangeLog
index cb3d6f1d59e1..b9c2371ace21 100644
--- a/x11-libs/xvba-video/ChangeLog
+++ b/x11-libs/xvba-video/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/xvba-video
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.12 2013/02/04 18:58:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.13 2013/02/04 19:09:19 scarabeus Exp $
+
+  04 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/xvba-video-fix-mesa-gl.h.patch, xvba-video-0.8.0-r1.ebuild,
+  xvba-video-9999.ebuild:
+  Fix broken build with mesa gl.h. Resolves bug#450098.
 
   04 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org> xvba-video-0.8.0-r1.ebuild,
   xvba-video-9999.ebuild:
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 000000000000..578d3321d92d
--- /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 <GL/glext.h>
+ #include <GL/glx.h>
+ 
++
++#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 <GL/gl.h>
++   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 19810405b14d..f20915f9db5c 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
 # 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.4 2013/02/04 18:58:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild,v 1.5 2013/02/04 19:09:19 scarabeus Exp $
 
 EAPI=5
 
@@ -40,6 +40,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-fix-mesa-gl.h.patch
 	eautoreconf
 }
 
diff --git a/x11-libs/xvba-video/xvba-video-9999.ebuild b/x11-libs/xvba-video/xvba-video-9999.ebuild
index de0fbc637010..499b27402e66 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-2013 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.4 2013/02/04 18:58:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-9999.ebuild,v 1.5 2013/02/04 19:09:19 scarabeus Exp $
 
 EAPI=5
 
@@ -37,6 +37,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-fix-mesa-gl.h.patch
+
 	eautoreconf
 }