diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-06-19 17:33:44 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-06-19 17:33:44 +0200 |
| commit | d4aa6099bd1e2a983a21a4ffb82ac6f1f72f05aa (patch) | |
| tree | 034840805f9c91f78102608edf1a6685aa618049 /pkgs/development/libraries/vaapi-vdpau | |
| parent | 4c6a98107080c13737223854e88f3ff12b95599a (diff) | |
Fixing vaapi-vdpau build with newer mesa.
Diffstat (limited to 'pkgs/development/libraries/vaapi-vdpau')
| -rw-r--r-- | pkgs/development/libraries/vaapi-vdpau/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/vaapi-vdpau/glext85.patch | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index a3d51217ead8d..fb24ba98b450b 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; + patches = [ ./glext85.patch ]; + meta = { homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; license = "GPLv2+"; diff --git a/pkgs/development/libraries/vaapi-vdpau/glext85.patch b/pkgs/development/libraries/vaapi-vdpau/glext85.patch new file mode 100644 index 0000000000000..d66dad3e17423 --- /dev/null +++ b/pkgs/development/libraries/vaapi-vdpau/glext85.patch @@ -0,0 +1,18 @@ +diff --git a/src/utils_glx.h b/src/utils_glx.h +index 19d03e4..f270fba 100644 +--- a/src/utils_glx.h ++++ b/src/utils_glx.h +@@ -42,6 +42,13 @@ typedef void (*PFNGLVDPAUMAPSURFACESNVPROC)(GLsizei numSurfaces, const GLvdpauSu + typedef void (*PFNGLVDPAUUNMAPSURFACESNVPROC)(GLsizei numSurface, const GLvdpauSurfaceNV *surfaces); + #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 ++ + /* GLX_EXT_texture_from_pixmap */ + #if GLX_GLXEXT_VERSION < 18 + typedef void (*PFNGLXBINDTEXIMAGEEXTPROC)(Display *, GLXDrawable, int, const int *); |