public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes proposed for 'release-13.10' into x-updates

Browse Source 
Conflicts (simple, taking whole higher/later versions):
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/polkit/default.nix
This commit is contained in:
Vladimír Čunát
2013-11-05 08:38:15 +01:00
parent 923bd1ebf5 1c0fdf2309
commit f448cc022b
19 changed files with 426 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ stdenv.mkDerivation {
patches = [
./static-gallium.patch
./dricore-gallium.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