- added -with-GL_GLEXT_VERSION-85.patch

diff --git a/libva-driver-vdpau-with-GL_GLEXT_VERSION-85.patch b/libva-driver-vdpau-with-GL_GLEXT_VERSION-85.patch
new file mode 100644 (file)
index 0000000..59f8ecd
--- /dev/null
+++ b/libva-driver-vdpau-with-GL_GLEXT_VERSION-85.patch
@@ -0,0 +1,30 @@
+From dd3e1e53a0c083c4dc16f3db4083ad5e4b7a866e Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Fri, 11 Jan 2013 21:04:40 +0100
+Subject: [PATCH] Fix libva-vdpau-driver with GL_GLEXT_VERSION >= 85
+
+---
+ src/utils_glx.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/utils_glx.h b/src/utils_glx.h
+index 19d03e4..42ae06f 100644
+--- a/src/utils_glx.h
++++ b/src/utils_glx.h
+@@ -67,6 +67,13 @@ typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
+ #define GL_PROGRAM_UNDER_NATIVE_LIMITS GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB
+ #endif
+ 
++#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
++
+ const char *
+ gl_get_error_string(GLenum error)
+     attribute_hidden;
+-- 
+1.7.11.7
+

diff --git a/libva-driver-vdpau.spec b/libva-driver-vdpau.spec
index 2426905d8b19d581f1ce27b845c79f3b8d23b0fe..2a5f6849c024a3b2bc1d5256e54bd3af45f94a99 100644 (file)
--- a/libva-driver-vdpau.spec
+++ b/libva-driver-vdpau.spec
@@ -7,6 +7,7 @@ License:        GPL v2+
 Group:         Libraries
 Source0:       http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/libva-vdpau-driver-%{version}.tar.bz2
 # Source0-md5: 5ec6d452d2dd307434ea3d32da49c3e5
+Patch0:         %{name}-with-GL_GLEXT_VERSION-85.patch
 URL:           http://www.freedesktop.org/wiki/Software/vaapi
 BuildRequires: OpenGL-GLX-devel
 BuildRequires: autoconf >= 2.57
@@ -25,6 +26,7 @@ Sterownik oparty na VDPAU dla VAAPI.
 
 %prep
 %setup -q -n libva-vdpau-driver-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}