main/mesa: upgrade to 19.0.6

- Switch build system to meson.
- Import musl TLS patch from Void linux.
- Remove glx_ro_text_segm.patch which is now provided by meson_options.

3 files changed, 88 insertions, 79 deletions

diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index d77edf9916..5f8a5c7faf 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=18.3.5
-pkgrel=3
+pkgver=19.0.6
+pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
 url="https://www.mesa3d.org"
 arch="all"
@@ -27,8 +27,6 @@ depends_dev="
 	"
 makedepends="
 	$depends_dev
-	autoconf
-	automake
 	bison
 	eudev-dev
 	expat-dev
@@ -46,6 +44,7 @@ makedepends="
 	libxxf86vm-dev
 	llvm$_llvmver-dev
 	makedepend
+	meson
 	py-mako
 	py3-libxml2
 	python3
@@ -58,30 +57,30 @@ makedepends="
 source="
 	https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
 	adjust-cache-deflate-buffer.patch
-	glx_ro_text_segm.patch
 	musl-fix-includes.patch
+	add-glx-use-tls.patch
 	"
 replaces="mesa-dricore"
 
 _dri_driverdir=/usr/lib/xorg/modules/dri
-_dri_drivers="r200,radeon,nouveau,swrast"
+_dri_drivers="r100,r200,nouveau"
 _gallium_drivers="r300,r600,radeonsi,nouveau,freedreno,swrast,virgl"
-_vulkan_drivers="radeon"
+_vulkan_drivers="amd"
 _arch_opts=
 
 case "$CARCH" in
 x86*)
 	_dri_drivers="${_dri_drivers},i915,i965"
 	_gallium_drivers="${_gallium_drivers},svga"
-	_vulkan_drivers="$_vulkan_drivers,intel"
+	_vulkan_drivers="${_vulkan_drivers},intel"
 	subpackages="$subpackages \
 			$pkgname-dri-intel:_dri \
 			$pkgname-dri-vmwgfx:_dri \
 			$pkgname-vulkan-intel:_vulkan"
-	_arch_opts="--enable-dri3"
+	_arch_opts="-Ddri3=true"
 	case "$CARCH" in
 	x86)
-		_arch_opts="$_arch_opts --enable-glx-rts --disable-asm";;
+		_arch_opts="$_arch_opts -Dglx-read-only-text=true -Dasm=false";;
 	esac
 	;;
 armhf|armv7|aarch64)
@@ -90,54 +89,45 @@ armhf|armv7|aarch64)
 	;;
 esac
 
-prepare() {
-	cd "$builddir"
-	default_prepare
-	libtoolize --force \
-		&& aclocal \
-		&& automake --add-missing \
-		&& autoreconf
-}
-
 build() {
 	cd "$builddir"
 
 	export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
+	meson \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--with-dri-driverdir=$_dri_driverdir \
-		--with-gallium-drivers=${_gallium_drivers} \
-		--with-dri-drivers=${_dri_drivers} \
-		--with-vulkan-drivers=${_vulkan_drivers} \
-		--with-llvm-prefix=/usr/lib/llvm$_llvmver \
-		--with-platforms=x11,drm,wayland \
-		--enable-llvm \
-		--enable-llvm-shared-libs \
-		--enable-shared-glapi \
-		--enable-gbm \
-		--enable-dri \
-		--enable-glx \
-		--enable-gallium-osmesa \
-		--enable-gles1 \
-		--enable-gles2 \
-		--enable-egl \
-		--enable-texture-float \
-		--enable-xa \
-		--enable-vdpau \
-		--enable-va \
-		--disable-xvmc \
-		--disable-glx-tls \
-		--disable-nine \
-		$_arch_opts
-	make
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--buildtype=release \
+		-Ddri-drivers-path=$_dri_driverdir \
+		-Dgallium-drivers=$_gallium_drivers \
+		-Ddri-drivers=$_dri_drivers \
+		-Dvulkan-drivers=$_vulkan_drivers \
+		-Dplatforms=x11,drm,wayland \
+		-Dllvm=true \
+		-Dshared-llvm=true \
+		-Dshared-glapi=true \
+		-Dgbm=true \
+		-Dglx=dri \
+		-Dosmesa=gallium \
+		-Dgles1=true \
+		-Dgles2=true \
+		-Degl=true \
+		-Dgallium-xa=true \
+		-Dgallium-vdpau=true \
+		-Dgallium-va=true \
+		-Dgallium-xvmc=false \
+		-Dglx-use-tls=false \
+		-Dgallium-nine=false \
+		-Db_ndebug=true \
+		$_arch_opts \
+		. output
+	ninja -C output
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" ninja -C output install
 }
 
 egl() {
@@ -297,7 +287,7 @@ _vulkan() {
 		_mv_vulkan intel ;;
 	esac
 }
-sha512sums="f229ac122eafee98d1a40c54adeb019eb4458cb67063db9ba760b265da0634fe77247c3c8cb5c5de5fd40f8545e35d45000a74af9257ebf4e2028156add8644c  mesa-18.3.5.tar.xz
+sha512sums="320fd6b12ccd5e4a40dfc93546354848a38da09d90e4d5a1dae5d100b8106942acfc25ac3f705a2d3ab3b355162c74c7dfadbdb99a46cf2e5e0761f8542bfeb1  mesa-19.0.6.tar.xz
 cdf22d2da3328e116c379264886bd01fd3ad5cc45fe03dc6fd97bdc4794502598ee195c0b9d975fa264d6ac31c6fa108c0535c91800ecf4fcabfd308e53074cc  adjust-cache-deflate-buffer.patch
-8a434ffefdc6ce924d613727a8649b9a77ad9f0ed0674c9cfb8f6ff0fec483f9318e681254535b62c957db1d0432f96427f917e2f139f4c65ef761bffb528255  glx_ro_text_segm.patch
-cf849044d6cc7d2af4ff015208fb09d70bf9660538699797da21bda2ecb7c1892d312af83d05116afd826708d9caafb1d05a13f09139c558aea6fee931e3eee7  musl-fix-includes.patch"
+cf849044d6cc7d2af4ff015208fb09d70bf9660538699797da21bda2ecb7c1892d312af83d05116afd826708d9caafb1d05a13f09139c558aea6fee931e3eee7  musl-fix-includes.patch
+1d89e305659bb0ca95b0b593dbc1a17ed28f4a18fabe468c20527302fc90c1ce11ca40a79c8786f1eca68ef643027af706b8689068e31c7f27ceb2303d51633e  add-glx-use-tls.patch"
diff --git a/main/mesa/add-glx-use-tls.patch b/main/mesa/add-glx-use-tls.patch
new file mode 100644
index 0000000000..dff55b58e4
--- /dev/null
+++ b/main/mesa/add-glx-use-tls.patch
@@ -0,0 +1,47 @@
+From f895a39b7437381a86383dd97250aa2cc7393bff Mon Sep 17 00:00:00 2001
+From: maxice8 <thinkabit.ukim@gmail.com>
+Date: Thu, 9 Aug 2018 18:37:30 -0300
+Subject: [PATCH] meson: add glx-use-tls option.
+
+---
+ meson.build       | 6 +++++-
+ meson_options.txt | 6 ++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5dbb786..1ab3092 100644
+--- a/meson.build
++++ b/meson.build
+@@ -340,7 +340,11 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless)
+   endif
+ endif
+ 
+-pre_args += '-DGLX_USE_TLS'
++with_glx_use_tls = get_option('glx-use-tls')
++if with_glx_use_tls
++  pre_args += '-DGLX_USE_TLS'
++endif
++
+ if with_glx != 'disabled'
+   if not (with_platform_x11 and with_any_opengl)
+     if with_glx == 'auto'
+diff --git a/meson_options.txt b/meson_options.txt
+index 496fe38..12981dd 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -195,6 +195,12 @@ option(
+   choices : ['auto', 'disabled', 'dri', 'xlib', 'gallium-xlib'],
+   description : 'Build support for GLX platform'
+ )
++option(
++  'glx-use-tls',
++  type : 'boolean',
++  value : true,
++  description : 'Build support for initial-exec TLS model on GLX platform'
++)
+ option(
+   'egl',
+   type : 'combo',
+-- 
+2.18.0
+
diff --git a/main/mesa/glx_ro_text_segm.patch b/main/mesa/glx_ro_text_segm.patch
deleted file mode 100644
index 621361ee5d..0000000000
--- a/main/mesa/glx_ro_text_segm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-2011-02-09	Jeremy Huddleston <jeremyhu@freedesktop.org
-
-	#240956
-	* configure.ac	add support to enable readonly test segment on x86
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -539,6 +539,20 @@
- 
- AM_CONDITIONAL(BUILD_SHARED, test "x$enable_shared" = xyes)
- 
-+
-+dnl readonly text segment on x86 hardened platforms
-+AC_ARG_ENABLE([glx_rts],
-+    [AS_HELP_STRING([--enable-glx-rts],
-+        [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])],
-+    [enable_glx_rts="$enableval"],
-+    [enable_glx_rts=no])
-+if test "x$enable_glx_rts" = xyes; then
-+    DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT"
-+else
-+    enable_glx_rts=no
-+fi
-+
-+
- dnl
- dnl other compiler options
- dnl