summary refs log tree commit diff
path: root/pkgs/development/libraries/mesa/static-gallium.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/mesa/static-gallium.patch')
-rw-r--r--pkgs/development/libraries/mesa/static-gallium.patch9
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/development/libraries/mesa/static-gallium.patch b/pkgs/development/libraries/mesa/static-gallium.patch
index 755682d9f1e..bb3f60eaf88 100644
--- a/pkgs/development/libraries/mesa/static-gallium.patch
+++ b/pkgs/development/libraries/mesa/static-gallium.patch
@@ -1,11 +1,4 @@
-commit 2c910b6f186616cac8134e2a2cbe239c8351ed99
-Author: Vladimír Čunát <vcunat@gmail.com>
-Date:   Mon May 13 11:34:34 2013 +0200
-
-    117-static-gallium.patch
-    
-    Conflicts (moving of VISIBILITY_ confused the merge):
-    	src/gallium/auxiliary/Makefile.am
+117-static-gallium.patch from Ubuntu Trusty
 
 diff --git a/configure.ac b/configure.ac
 index b9fcb0b..be89843 100644