rpms/libva-vdpau-driver/F-18 0001-Fix-libva-vdpau-driver-with-GL_GLEXT_VERSION-85.patch, NONE, 1.1 libva-vdpau-driver.spec, 1.3, 1.4

Author: kwizart Update of /cvs/free/rpms/libva-vdpau-driver/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7735/F-18 Modified Files: libva-vdpau-driver.spec Added Files: 0001-Fix-libva-vdpau-driver-with-GL_GLEXT_VERSION-85.patch Log Message: Fix build with recent mesa 0001-Fix-libva-vdpau-driver-with-GL_GLEXT_VERSION-85.patch: utils_glx.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- NEW FILE 0001-Fix-libva-vdpau-driver-with-GL_GLEXT_VERSION-85.patch --- From: Nicolas Chauvet <kwizart(a)gmail.com&gt; 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 Index: libva-vdpau-driver.spec =================================================================== RCS file: /cvs/free/rpms/libva-vdpau-driver/F-18/libva-vdpau-driver.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libva-vdpau-driver.spec 2 Jan 2013 15:55:54 -0000 1.3 +++ libva-vdpau-driver.spec 11 Jan 2013 20:25:42 -0000 1.4 @@ -2,12 +2,13 @@ Name: libva-vdpau-driver Version: 0.7.4 -Release: 1%{?preversion}%{?dist} +Release: 2%{?preversion}%{?dist} Summary: HW video decode support for VDPAU platforms Group: System Environment/Libraries License: GPLv2+ URL: http://cgit.freedesktop.org/vaapi/vdpau-driver Source0: http://www.freedesktop.org/software/vaapi/releases/%{name}/%{name}-%{vers... +Patch0: 0001-Fix-libva-vdpau-driver-with-GL_GLEXT_VERSION-85.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: libtool BuildRequires: libva-devel @@ -24,6 +25,7 @@ %prep %setup -q -n %{name}-%{version}%{?preversion} +%patch0 -p1 %build %configure --enable-glx @@ -43,6 +45,9 @@ %{_libdir}/dri/*.so %changelog +* Fri Jan 11 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.7.4-2 +- Fix build with recent mesa + * Sun Oct 07 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.7.4-1 - Update to 0.7.4