user/mesa: Update to 21.3.8

4 files changed, 21 insertions, 51 deletions

diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD
index 8eb3a077b..daa7b1b14 100644
--- a/user/mesa/APKBUILD
+++ b/user/mesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=mesa
-pkgver=20.3.5
-_llvmver=8
+pkgver=21.3.8
+_llvmver=14
 pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
 url="https://www.mesa3d.org"
@@ -21,9 +21,7 @@ subpackages="$pkgname-dev $pkgname-dri
 	$pkgname-xatracker $pkgname-osmesa $pkgname-gbm"
 #	requires glslang: $pkgname-vulkan-overlay
 source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
-	amdgpu-pthread-header.patch
 	big-endian-flipping.patch
-	intel-vulkan.patch
 	musl-fixes.patch
 	no-tls.patch
 	"
@@ -36,7 +34,7 @@ _vulkan_drivers="amd"
 case "$CARCH" in
 x86* | pmmx)
 	_dri_drivers="${_dri_drivers},i965"
-	_gallium_drivers="${_gallium_drivers},i915,svga"
+	_gallium_drivers="${_gallium_drivers},i915,svga,iris"
 	_vulkan_drivers="${_vulkan_drivers},intel"
 	;;
 aarch64 | arm*)
@@ -58,7 +56,7 @@ build() {
 		-Ddri-drivers=$_dri_drivers \
 		-Dgallium-drivers=$_gallium_drivers \
 		-Dvulkan-drivers=$_vulkan_drivers \
-		-Dosmesa=gallium \
+		-Dosmesa=true \
 		$_arch_conf \
 		build
 
@@ -152,9 +150,7 @@ dri() {
 	mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/
 }
 
-sha512sums="481e710ed80d8f215a8d541cfe51b960862c2403c2b9e7e6932c8236b8decb5d478871d6c73559d6d795ada143803764f3a93b2329588c80f62e2e5ec98c78a9  mesa-20.3.5.tar.xz
-245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa  amdgpu-pthread-header.patch
+sha512sums="0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9  mesa-21.3.8.tar.xz
 3417e5c6d7ec564178e1d72431042b0a6ba659321f13a3dda81eda5fa0f2c8bc7c6972cb8266aea84ab05976ffb161659e9988c50ecc418e8bc1e1ce8f93a65f  big-endian-flipping.patch
-ba954ea9aa49e5cdfec08f310f41abf09e01a2a889a09b6c32a154b750d3ebb2bfb5a9b7d244c06d26442688aeeb7f212f5f3c98c6db69f878098a49d476ff70  intel-vulkan.patch
 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553  musl-fixes.patch
-d059ef74bc2b16aadd2737aa19810da82e5ff37d897faf231f9b028e0d490014b493e779f92503ccf22636c0488ac18faaa25b1f9ff324fc62fbe0d6d844a2bd  no-tls.patch"
+076bb17d85235f3c833af8f1641f3556e406ad187b7ae1ebacced5f57b8832243a878678de4e50880c9a50b2aae3c42ad2342ed8c3e18d881edb7dd5018a710e  no-tls.patch"
diff --git a/user/mesa/amdgpu-pthread-header.patch b/user/mesa/amdgpu-pthread-header.patch
deleted file mode 100644
index 576d57ffc..000000000
--- a/user/mesa/amdgpu-pthread-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mesa-18.1.3/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h.old	2018-06-29 17:47:29.000000000 +0000
-+++ mesa-18.1.3/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h	2018-07-09 02:13:04.590000000 +0000
-@@ -28,6 +28,7 @@
- #ifndef RADV_AMDGPU_WINSYS_H
- #define RADV_AMDGPU_WINSYS_H
- 
-+#include <pthread.h>
- #include "radv_radeon_winsys.h"
- #include "ac_gpu_info.h"
- #include "addrlib/addrinterface.h"
diff --git a/user/mesa/intel-vulkan.patch b/user/mesa/intel-vulkan.patch
deleted file mode 100644
index 6ba03d6d1..000000000
--- a/user/mesa/intel-vulkan.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 791ece114e2e27fa4ede1a998650964bd37d867b Mon Sep 17 00:00:00 2001
-From: Eric Engestrom <eric.engestrom@intel.com>
-Date: Sun, 27 Oct 2019 00:04:33 +0100
-Subject: [PATCH] anv: add missing xmlconfig headers dependency
-
-Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
-Acked-by: Dylan Baker <dylan@pnwbakers.com>
----
- src/intel/vulkan/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
-index 69e472f719b..10fc4c4e611 100644
---- a/src/intel/vulkan/meson.build
-+++ b/src/intel/vulkan/meson.build
-@@ -133,6 +133,7 @@ anv_deps = [
-   dep_valgrind,
-   idep_nir_headers,
-   idep_vulkan_util_headers,
-+  idep_xmlconfig_headers,
- ]
- anv_flags = [
-   c_vis_args,
--- 
-2.24.1
-
diff --git a/user/mesa/no-tls.patch b/user/mesa/no-tls.patch
index a6b989e87..803fa3707 100644
--- a/user/mesa/no-tls.patch
+++ b/user/mesa/no-tls.patch
@@ -1,14 +1,24 @@
---- mesa-20.3.5/meson.build.old	2021-03-24 14:10:48.523084000 -0500
-+++ mesa-20.3.5/meson.build	2022-05-29 23:43:09.679306824 -0500
-@@ -434,12 +434,7 @@
-   with_egl = false
+--- mesa-21.3.8/meson.build.old	2022-03-18 14:26:47.000000000 -0500
++++ mesa-21.3.8/meson.build	2022-05-30 00:00:21.689085198 -0500
+@@ -508,22 +508,7 @@
+   error('-Degl-native-platform does not specify an enabled platform')
  endif
  
 -# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
  use_elf_tls = false
--if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+-if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
+-    (not with_platform_android or get_option('platform-sdk-version') >= 29) and
+-    (not with_platform_windows or not with_shared_glapi))
 -  pre_args += '-DUSE_ELF_TLS'
 -  use_elf_tls = true
+-
+-  if with_platform_android
+-    # By default the NDK compiler, at least, emits emutls references instead of
+-    # ELF TLS, even when building targeting newer API levels.  Make it actually do
+-    # ELF TLS instead.
+-    c_args += '-fno-emulated-tls'
+-    cpp_args += '-fno-emulated-tls'
+-  endif
 -endif
  
  if with_glx != 'disabled'