[Pkg-fglrx-devel] r1406 - in xvba-video/trunk/debian: . patches

[Andreas Beckmann]

Author: anbe
Date: 2014-09-27 18:43:07 +0000 (Sat, 27 Sep 2014)
New Revision: 1406

Added:
   xvba-video/trunk/debian/patches/xvba-video-fix-mesa-gl.h.patch
Modified:
   xvba-video/trunk/debian/changelog
   xvba-video/trunk/debian/patches/series
Log:
fix FTBFS with current MESA

Modified: xvba-video/trunk/debian/changelog
===================================================================
--- xvba-video/trunk/debian/changelog	2014-09-27 18:19:51 UTC (rev 1405)
+++ xvba-video/trunk/debian/changelog	2014-09-27 18:43:07 UTC (rev 1406)
@@ -6,6 +6,8 @@
 
   [ Andreas Beckmann ]
   * Bump Standards-Version to 3.9.5 (no changes needed).
+  * Pick patches from Gentoo to fix FTBFS:
+    - xvba-video-fix-mesa-gl.h.patch
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 19 Jun 2014 15:30:51 +0200
 

Modified: xvba-video/trunk/debian/patches/series
===================================================================
--- xvba-video/trunk/debian/patches/series	2014-09-27 18:19:51 UTC (rev 1405)
+++ xvba-video/trunk/debian/patches/series	2014-09-27 18:43:07 UTC (rev 1406)
@@ -1 +1,2 @@
 01-glx-assert.diff
+xvba-video-fix-mesa-gl.h.patch

Added: xvba-video/trunk/debian/patches/xvba-video-fix-mesa-gl.h.patch
===================================================================
--- xvba-video/trunk/debian/patches/xvba-video-fix-mesa-gl.h.patch	                        (rev 0)
+++ xvba-video/trunk/debian/patches/xvba-video-fix-mesa-gl.h.patch	2014-09-27 18:43:07 UTC (rev 1406)
@@ -0,0 +1,21 @@
+Description: Fix broken build with mesa gl.h.
+Bug-Gentoo: bug#450098
+Origin: vendor, http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/xvba-video/files/xvba-video-fix-mesa-gl.h.patch
+
+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