Update patches

3 files changed, 1 insertions, 61 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index cd8b0bd..a317e9a 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -357,13 +357,11 @@ 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-use-of-alloca-without-include-c99_alloca.h.patch' ],
+                                    '0002-megadriver-explicitly-link-against-glapi-link-with-n.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' ],
                   'khronos-opengl-registry' : [ 'Makefile.patch' ],
-                  'xserver' :     [ '0003-Revert-dmx-fix-linking.patch' ],
 	        }
 
       if name in patches:
diff --git a/patches/mesa-mesa/0003-Fix-use-of-alloca-without-include-c99_alloca.h.patch b/patches/mesa-mesa/0003-Fix-use-of-alloca-without-include-c99_alloca.h.patch
deleted file mode 100644
index a16c05f..0000000
--- a/patches/mesa-mesa/0003-Fix-use-of-alloca-without-include-c99_alloca.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3b00c72a92ca1091d11ecffd8db404dcd598e63d Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Wed, 13 Dec 2017 19:49:07 +0000
-Subject: [PATCH] Fix use of alloca() without #include <c99_alloca.h>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-../../../src/mesa/main/shaderapi.c: In function ‘_mesa_ShaderBinary’:
-../../../src/mesa/main/shaderapi.c:2188:9: error: implicit declaration of function ‘alloca’ [-Werror=implicit-function-declaration]
-
-Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
----
- src/mesa/main/shaderapi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
-index d824a88ca2f..2c11e4d5bb6 100644
---- a/src/mesa/main/shaderapi.c
-+++ b/src/mesa/main/shaderapi.c
-@@ -38,6 +38,7 @@
- 
- 
- #include <stdbool.h>
-+#include <c99_alloca.h>
- #include "main/glheader.h"
- #include "main/context.h"
- #include "main/dispatch.h"
--- 
-2.15.1
-
diff --git a/patches/xserver/0003-Revert-dmx-fix-linking.patch b/patches/xserver/0003-Revert-dmx-fix-linking.patch
deleted file mode 100644
index ff5d30b..0000000
--- a/patches/xserver/0003-Revert-dmx-fix-linking.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a3e12c9b904b717b93b2f636c204d38de9596aa6 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Sun, 5 Mar 2017 20:39:23 +0000
-Subject: [PATCH xserver 3/3] Revert "dmx: fix linking"
-
-This reverts commit 3ef16dfb9830bd6b41ae428f4f213ae0c35c1056.
----
- hw/dmx/Makefile.am | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
-index 38d6ac4..eef84cb 100644
---- a/hw/dmx/Makefile.am
-+++ b/hw/dmx/Makefile.am
-@@ -80,8 +80,7 @@ XDMX_LIBS = \
- 
- Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
- Xdmx_DEPENDENCIES= $(XDMX_LIBS)
--Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS) \
--             $(top_builddir)/render/librender.la
-+Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS)
- 
- relink:
- 	$(AM_V_at)rm -f Xdmx$(EXEEXT) && $(MAKE) Xdmx$(EXEEXT)
--- 
-2.8.3
-