Update mesa patches

5 files changed, 18 insertions, 53 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 93040a0..ef7ecfc 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -356,8 +356,7 @@ def BuilderList(slaves):
       # some repos need patches (which are not yet upstreamable) applied
       patches = { 'mesa-mesa' :   [ '0001-gallium-targets-dri-explicitly-link-against-glapi-us.patch',
                                     '0002-megadriver-explicitly-link-against-glapi-link-with-n.patch',
-                                    '0003-Fix-building-libwindowsdri-when-libX11-headers-are-i.patch',
-                                    '0004-shader-disk-cache-requires-dladdr.patch' ],
+                                    '0003-Fix-building-libwindowsdri-when-libX11-headers-are-i.patch' ],
                   'mesa-glut' :   [ '0001-Fix-build-when-GL-or-libX11-are-in-non-standard-loca.patch' ],
                   'app-sessreg' : [ '0001-Don-t-try-to-use-utmpx-functions-if-WTMPX_FILE-isn-t.patch' ],
                   'app-xdm' :     [ '0001-Workaround-Cygwin-s-failure-to-prototype-initgroups.patch' ],
diff --git a/patches/mesa-mesa/0001-gallium-targets-dri-explicitly-link-against-glapi-us.patch b/patches/mesa-mesa/0001-gallium-targets-dri-explicitly-link-against-glapi-us.patch
index df7d24c..33c5c7d 100644
--- a/patches/mesa-mesa/0001-gallium-targets-dri-explicitly-link-against-glapi-us.patch
+++ b/patches/mesa-mesa/0001-gallium-targets-dri-explicitly-link-against-glapi-us.patch
@@ -1,7 +1,7 @@
-From 9e6bc307290d165efef28254027fcde094988a37 Mon Sep 17 00:00:00 2001
+From b03b3cd46dc9e7d8f1d1ec2f6222aaed6fa289ff Mon Sep 17 00:00:00 2001
 From: Jon TURNEY <jon.turney@dronecode.org.uk>
 Date: Sat, 30 Nov 2013 16:39:51 +0000
-Subject: [PATCH 1/4] gallium/targets/dri: explicitly link against glapi, use
+Subject: [PATCH 1/3] gallium/targets/dri: explicitly link against glapi, use
  -no-undefined
 
 On Cygwin we need to link against the static or shared glapi provider so it can
@@ -17,10 +17,10 @@ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
  1 file changed, 7 insertions(+)
 
 diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
-index 7f945d1..46a01d1 100644
+index e61df81228..1276c46088 100644
 --- a/src/gallium/targets/dri/Makefile.am
 +++ b/src/gallium/targets/dri/Makefile.am
-@@ -23,6 +23,7 @@ nodist_EXTRA_gallium_dri_la_SOURCES = dummy.cpp
+@@ -22,6 +22,7 @@ nodist_EXTRA_gallium_dri_la_SOURCES = dummy.cpp
  gallium_dri_la_SOURCES =
  
  gallium_dri_la_LDFLAGS = \
@@ -28,7 +28,7 @@ index 7f945d1..46a01d1 100644
  	-shared \
  	-shrext .so \
  	-module \
-@@ -55,6 +56,12 @@ gallium_dri_la_LIBADD = \
+@@ -57,6 +58,12 @@ gallium_dri_la_LIBADD = \
  	$(LIBDRM_LIBS) \
  	$(GALLIUM_COMMON_LIB_DEPS)
  
@@ -42,5 +42,5 @@ index 7f945d1..46a01d1 100644
  	dri.sym \
  	$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
 -- 
-2.4.5
+2.12.3
 
diff --git a/patches/mesa-mesa/0002-megadriver-explicitly-link-against-glapi-link-with-n.patch b/patches/mesa-mesa/0002-megadriver-explicitly-link-against-glapi-link-with-n.patch
index 8e1c1a1..3533ba3 100644
--- a/patches/mesa-mesa/0002-megadriver-explicitly-link-against-glapi-link-with-n.patch
+++ b/patches/mesa-mesa/0002-megadriver-explicitly-link-against-glapi-link-with-n.patch
@@ -1,7 +1,7 @@
-From 1b5d43a719726e0f34aeddf87071d91ba1403233 Mon Sep 17 00:00:00 2001
+From 9b4a998e4c15e1d2d79be3b030a98c1a340b50df Mon Sep 17 00:00:00 2001
 From: Jon TURNEY <jon.turney@dronecode.org.uk>
 Date: Mon, 3 Mar 2014 20:05:03 +0000
-Subject: [PATCH 2/4] megadriver: explicitly link against glapi, link with
+Subject: [PATCH 2/3] megadriver: explicitly link against glapi, link with
  -no-undefined
 
 On cygwin we need to link against the static or shared glapi provider so it can
@@ -13,23 +13,14 @@ require that all symbols are resolved when the library is linked."
 
 Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
 ---
- src/mesa/drivers/dri/Makefile.am | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ src/mesa/drivers/dri/Makefile.am | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
 diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
-index 08a8e64..fe29e2c 100644
+index 381c6a20b7..8f3f2b98fb 100644
 --- a/src/mesa/drivers/dri/Makefile.am
 +++ b/src/mesa/drivers/dri/Makefile.am
-@@ -52,7 +52,7 @@ driinclude_HEADERS = \
- nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp
- mesa_dri_drivers_la_SOURCES =
- mesa_dri_drivers_la_LDFLAGS = \
--        -module -avoid-version -shared -shrext .so \
-+        -module -avoid-version -shared -shrext .so -no-undefined \
-         $(BSYMBOLIC) \
-         $(GC_SECTIONS) \
-         $()
-@@ -65,6 +65,12 @@ mesa_dri_drivers_la_LIBADD = \
+@@ -71,6 +71,12 @@ mesa_dri_drivers_la_LIBADD = \
          $(DRI_LIB_DEPS) \
          $()
  
@@ -43,5 +34,5 @@ index 08a8e64..fe29e2c 100644
  dri_LTLIBRARIES = mesa_dri_drivers.la
  
 -- 
-2.4.5
+2.12.3
 
diff --git a/patches/mesa-mesa/0003-Fix-building-libwindowsdri-when-libX11-headers-are-i.patch b/patches/mesa-mesa/0003-Fix-building-libwindowsdri-when-libX11-headers-are-i.patch
index 25a4778..1793655 100644
--- a/patches/mesa-mesa/0003-Fix-building-libwindowsdri-when-libX11-headers-are-i.patch
+++ b/patches/mesa-mesa/0003-Fix-building-libwindowsdri-when-libX11-headers-are-i.patch
@@ -1,7 +1,7 @@
-From 6e4dbc439a3de4da2bbdc2c456c16f6031edea3f Mon Sep 17 00:00:00 2001
+From dadbf20be85502cb01b773e01e25b9983dbca27a Mon Sep 17 00:00:00 2001
 From: Jon Turney <jon.turney@dronecode.org.uk>
 Date: Thu, 15 Sep 2016 16:04:16 +0100
-Subject: [PATCH 1/2] Fix building libwindowsdri when libX11 headers are
+Subject: [PATCH 3/3] Fix building libwindowsdri when libX11 headers are
  installed in a non-standard location
 
 Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
@@ -10,7 +10,7 @@ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
  1 file changed, 3 insertions(+)
 
 diff --git a/src/glx/windows/Makefile.am b/src/glx/windows/Makefile.am
-index c76af81..11435cb 100644
+index f84288b935..f4f8e9664d 100644
 --- a/src/glx/windows/Makefile.am
 +++ b/src/glx/windows/Makefile.am
 @@ -10,6 +10,9 @@ pkgconfig_DATA = windowsdriproto.pc
@@ -24,5 +24,5 @@ index c76af81..11435cb 100644
  libwindowsglx_la_SOURCES = \
  	windowsgl.c \
 -- 
-2.8.3
+2.12.3
 
diff --git a/patches/mesa-mesa/0004-shader-disk-cache-requires-dladdr.patch b/patches/mesa-mesa/0004-shader-disk-cache-requires-dladdr.patch
deleted file mode 100644
index 7fa2ec0..0000000
--- a/patches/mesa-mesa/0004-shader-disk-cache-requires-dladdr.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d7fc5a7a4cc23af35278f23c76ab644ba2fbea42 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Sun, 5 Mar 2017 17:17:23 +0000
-Subject: [PATCH] shader disk cache requires dladdr()
-
----
- src/util/disk_cache.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/disk_cache.h b/src/util/disk_cache.h
-index b7c0df2..08261c7 100644
---- a/src/util/disk_cache.h
-+++ b/src/util/disk_cache.h
-@@ -45,7 +45,7 @@ struct disk_cache;
- static inline bool
- disk_cache_get_function_timestamp(void *ptr, uint32_t* timestamp)
- {
--#ifdef ENABLE_SHADER_CACHE
-+#if defined(ENABLE_SHADER_CACHE) && defined(HAVE_DLADDR)
-    Dl_info info;
-    struct stat st;
-    if (!dladdr(ptr, &info) || !info.dli_fname) {
--- 
-2.8.3
-