mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

mesa: Minor fix on GL/gl.h

Browse source 
Apply a fix which prevented to use -DGL_GLEXT_LEGACY, -Werror and -Wundef
to be used together. This produced a build fail on any software meeting
these requirements.
This commit is contained in:
bbenoist 2013-09-30 15:38:26 +02:00
parent 45851fc39a
commit 4edbaf9aa1
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/libraries/mesa/default.nix
View file

@ -41,6 +41,7 @@ stdenv.mkDerivation {
./static-gallium.patch
./dricore-gallium.patch
./fix-rounding.patch
./werror-wundef.patch
];
# Change the search path for EGL drivers from $drivers/* to driverLink

12
pkgs/development/libraries/mesa/werror-wundef.patch Normal file
View file

@ -0,0 +1,12 @@
diff -rupN Mesa-9.2.0-orig/include/GL/gl.h Mesa-9.2.0/include/GL/gl.h
--- Mesa-9.2.0-orig/include/GL/gl.h 2013-08-14 03:34:42.000000000 +0200
+++ Mesa-9.2.0/include/GL/gl.h 2013-09-24 19:34:58.319140812 +0200
@@ -2088,7 +2088,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOO
-#if GL_ARB_shader_objects
+#if defined(GL_ARB_shaders_objects) && GL_ARB_shader_objects
#ifndef GL_MESA_shader_debug
#define GL_MESA_shader_debug 1