From: Karol Krenski <charles@pld-linux.org>
Date: Sun, 17 Feb 2013 00:08:22 +0000 (+0100)
Subject: - added -with-GL_GLEXT_VERSION-85.patch
X-Git-Tag: auto/th/libva-driver-vdpau-0.7.4-1~3
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=2a6c61bead395b61e40c3c412139ac166b2b3176;p=packages%2Flibva-driver-vdpau.git

- 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
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 2426905..2a5f684 100644
--- 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}