Update for mesonic mesa

6 files changed, 3 insertions, 88 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index a26ff14..31992ff 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -215,7 +215,7 @@ def SchedulerList():
       repo = get_repo(b)
 
       # high-activity repositories get a tree-stable timer
-      if m.get('id') in [ 'mesa-mesa', 'mesa-mesa-meson' ]:
+      if m.get('id') in [ 'mesa-mesa' ]:
         timer = 300 # 5 minutes
         print("%s %d" % (m.get('id'), timer))
       else:
@@ -276,7 +276,7 @@ def BuilderList(slaves):
     else:
       category = 'misc'
 
-    if name in [ 'mesa-mesa', 'mesa-mesa-meson', 'xserver', 'xserver-meson' ]:
+    if name in [ 'mesa-mesa', 'xserver', 'xserver-meson' ]:
       incremental = True
     else:
       incremental = False
@@ -323,13 +323,12 @@ def BuilderList(slaves):
 
       autogenargs = {
                       'xserver'          : '--enable-xvfb --enable-xnest --enable-dmx --enable-kdrive --enable-xephyr --enable-xfake --disable-xfbdev --enable-xorg --enable-xwin --enable-xf86bigfont --enable-debug --disable-glamor',
-                      'mesa-mesa'        : '--enable-autotools --disable-xa --with-gallium-drivers=swrast --disable-dri3 --disable-egl --enable-osmesa --enable-shared --disable-static --enable-driglx-direct --with-platforms=x11',
                       'mesa-demos'       : '--with-glut='+prefix,
                       'xf86-video-dummy' : '--disable-dga', # config check needs fixing to default to auto, not yes
                       'xts'              : '--disable-shared',
                       'fontconfig'       : '--with-default-fonts=' + os.path.join(prefix, 'share', 'fonts'),
                       'xserver-meson'    : '-Dudev=false -Dpciaccess=false -Dint10=false -Dsystemd_logind=false -Ddmx=true -Dxephyr=true -Dglamor=false -Ddefault_font_path=catalogue:/etc/X11/fontpath.d,built-ins -Dxkb_default_rules=base',
-                      'mesa-mesa-meson'  : '-Degl=false -Dbuild-tests=true',
+                      'mesa-mesa'  : '-Degl=false -Dbuild-tests=true',
                     }
 
       extra = []
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
deleted file mode 100644
index 33c5c7d..0000000
--- a/patches/mesa-mesa/0001-gallium-targets-dri-explicitly-link-against-glapi-us.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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/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
-be built with no unresolved references.
-
-"Use -no-undefined to assure libtool that the library has no unresolved symbols
-at link time, so that libtool will build a shared library on platforms that
-require that all symbols are resolved when the library is linked."
-
-Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
----
- src/gallium/targets/dri/Makefile.am | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
-index e61df81228..1276c46088 100644
---- a/src/gallium/targets/dri/Makefile.am
-+++ b/src/gallium/targets/dri/Makefile.am
-@@ -22,6 +22,7 @@ nodist_EXTRA_gallium_dri_la_SOURCES = dummy.cpp
- gallium_dri_la_SOURCES =
- 
- gallium_dri_la_LDFLAGS = \
-+	-no-undefined \
- 	-shared \
- 	-shrext .so \
- 	-module \
-@@ -57,6 +58,12 @@ gallium_dri_la_LIBADD = \
- 	$(LIBDRM_LIBS) \
- 	$(GALLIUM_COMMON_LIB_DEPS)
- 
-+if HAVE_SHARED_GLAPI
-+gallium_dri_la_LIBADD += $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-+else
-+gallium_dri_la_LIBADD += $(top_builddir)/src/mapi/glapi/libglapi.la
-+endif
-+
- EXTRA_gallium_dri_la_DEPENDENCIES = \
- 	dri.sym \
- 	$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
--- 
-2.12.3
-
diff --git a/patches/mesa-mesa-meson/0001-meson-Increase-timeout-for-glcpp-tests.patch b/patches/mesa-mesa/0001-meson-Increase-timeout-for-glcpp-tests.patch
index cb08926..cb08926 100644
--- a/patches/mesa-mesa-meson/0001-meson-Increase-timeout-for-glcpp-tests.patch
+++ b/patches/mesa-mesa/0001-meson-Increase-timeout-for-glcpp-tests.patch
diff --git a/patches/mesa-mesa-meson/0002-Add-some-slop-to-u_format_test-for-8unorm-formats.patch b/patches/mesa-mesa/0002-Add-some-slop-to-u_format_test-for-8unorm-formats.patch
index e8d8265..e8d8265 100644
--- a/patches/mesa-mesa-meson/0002-Add-some-slop-to-u_format_test-for-8unorm-formats.patch
+++ b/patches/mesa-mesa/0002-Add-some-slop-to-u_format_test-for-8unorm-formats.patch
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
deleted file mode 100644
index 3533ba3..0000000
--- a/patches/mesa-mesa/0002-megadriver-explicitly-link-against-glapi-link-with-n.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/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
-be built with no unresolved references.
-
-"Use -no-undefined to assure libtool that the library has no unresolved symbols
-at link time, so that libtool will build a shared library on platforms that
-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 | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
-index 381c6a20b7..8f3f2b98fb 100644
---- a/src/mesa/drivers/dri/Makefile.am
-+++ b/src/mesa/drivers/dri/Makefile.am
-@@ -71,6 +71,12 @@ mesa_dri_drivers_la_LIBADD = \
-         $(DRI_LIB_DEPS) \
-         $()
- 
-+if HAVE_SHARED_GLAPI
-+mesa_dri_drivers_la_LIBADD += $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-+else
-+mesa_dri_drivers_la_LIBADD += $(top_builddir)/src/mapi/glapi/libglapi.la
-+endif
-+
- if NEED_MEGADRIVER
- dri_LTLIBRARIES = mesa_dri_drivers.la
- 
--- 
-2.12.3
-
diff --git a/patches/mesa-mesa-meson/0003-meson-Force-.so-extension-for-megadriver-modules.patch b/patches/mesa-mesa/0003-meson-Force-.so-extension-for-megadriver-modules.patch
index 5397aa7..5397aa7 100644
--- a/patches/mesa-mesa-meson/0003-meson-Force-.so-extension-for-megadriver-modules.patch
+++ b/patches/mesa-mesa/0003-meson-Force-.so-extension-for-megadriver-modules.patch