main/mesa: upgrade to 21.1.2

3 files changed, 39 insertions, 46 deletions

diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 5b1231dbe1..31bc0e6e4f 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=21.0.3
+pkgver=21.1.2
 pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
 url="https://www.mesa3d.org"
@@ -18,6 +18,7 @@ subpackages="
 	$pkgname-vulkan-ati:_vulkan
 	$pkgname-dri-ati:_dri_deprecated
 	$pkgname-dri-nouveau:_dri_deprecated
+	$pkgname-vulkan-layers:_vulkan_layers
 	"
 _llvmver=11
 depends_dev="
@@ -57,10 +58,10 @@ makedepends="
 	xorgproto
 	zlib-dev
 	zstd-dev
+	glslang-dev
 	"
 source="
 	https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
-	adjust-cache-deflate-buffer.patch
 	musl-fix-includes.patch
 	add-use-elf-tls.patch
 	disable-rgb10-by-default.patch
@@ -82,18 +83,18 @@ _gallium_provides="
 	$pkgname-dri-virtio=$pkgver-r$pkgrel
 	"
 _vulkan_drivers="amd"
-_vulkan_overlay_layer=false
+_vulkan_layers="device-select,overlay"
 case "$CARCH" in
 x86*)
 	_dri_drivers="${_dri_drivers},i915,i965"
 	_gallium_drivers="${_gallium_drivers},svga,iris"
 	_vulkan_drivers="${_vulkan_drivers},intel"
-	_vulkan_overlay_layer=true
-	makedepends="$makedepends glslang"
-	subpackages="$subpackages \
-			$pkgname-dri-intel:_dri_deprecated \
+	_vulkan_layers="$_vulkan_layers,intel-nullhw"
+	subpackages="
+			$subpackages
+			$pkgname-dri-intel:_dri_deprecated
 			$pkgname-vulkan-intel:_vulkan
-			$pkgname-vulkan-layer:_vulkan_layer"
+			"
 	_gallium_provides="$_gallium_provides $pkgname-dri-vmwgfx=$pkgver-r$pkgrel"
 	_arch_opts="-Ddri3=enabled"
 	case "$CARCH" in
@@ -127,7 +128,7 @@ build() {
 		-Dgallium-drivers=$_gallium_drivers \
 		-Ddri-drivers=$_dri_drivers \
 		-Dvulkan-drivers=$_vulkan_drivers \
-		-Dvulkan-overlay-layer=$_vulkan_overlay_layer \
+		-Dvulkan-layers=$_vulkan_layers \
 		-Dplatforms=x11,wayland \
 		-Dllvm=enabled \
 		-Dshared-llvm=enabled \
@@ -312,20 +313,27 @@ _vulkan() {
 	esac
 }
 
-_vulkan_layer() {
-	pkgdesc="Vulkan overlay layer to display information about the application"
-	depends=""
-
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share/vulkan "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/share/vulkan/explicit_layer.d "$subpkgdir"/usr/share/vulkan
-	mv "$pkgdir"/usr/lib/libVkLayer_MESA_overlay.so "$subpkgdir"/usr/lib
-
-	mv "$pkgdir"/usr/bin/mesa-overlay-control.py "$subpkgdir"/usr/bin
+_vulkan_layers() {
+	pkgdesc="collectin of vulkan layers from mesa"
+	depends="python3"
+
+	# Remove this after the release of the next stable (3.14)
+	# it originally was claed layer as it only packaged the
+	# overlay one but now it also packages device-select and
+	# intel-nullhw (on x86*)
+	provides="$pkgname-vulkan-layer=$pkgver-r$pkgrel"
+	replaces="$pkgname-vulkan-layer=$pkgver-r$pkgrel"
+
+	amove usr/share/vulkan/explicit_layer.d
+	amove usr/share/vulkan/implicit_layer.d
+	amove usr/lib/libVkLayer_*.so
+	amove usr/bin/mesa-overlay-control.py
 }
 
-sha512sums="4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f  mesa-21.0.3.tar.xz
-adb6ccac89bc5a382689db615184b7b36a267001e8e27f951e68020e45edd318fc278408c9eae922a74db3df3d98d52f13119d4e3691be38bd05e6a57348103e  adjust-cache-deflate-buffer.patch
+sha512sums="
+a7907fa29fdb4e137015ee5405b9c8c0769ef9354bbe963c1af80318b398c05c79db6129b583106d620c42a5e9b625611b648fd5207334eb9b588d7963defc70  mesa-21.1.2.tar.xz
 77b40d3b70a78e1f261f0a0358f3b5f15d5f0a6d51ba317e38053f426a14487a459743df2e4734e9c086f1f083572e78279eb8a5dde191ef0c2914594513194b  musl-fix-includes.patch
-bebf9f725d49da3de665b69e2ddf4b3006000f59afa47f4a2a3c1d1c552d86bbfcb88e92532172c2f898c3a416b4b1735b6ae7deeb2578660141437f74112784  add-use-elf-tls.patch
+de7c6fec14476539c564afa4bf59a3c8d5f34a687ffdbacfe94403e3ad4e78773222b2b74b08a1fd16b7dc9504decca1429273c179ad702c02a140e1dff15205  add-use-elf-tls.patch
 efdb49daf7daa173a349785497c2d908f3140ce133d84ef9b2b983afdafda8ee853b3edcd96889b614cc0477e076c7ba2cea4b409f396df3da0561534975459b  disable-rgb10-by-default.patch
-fdbc13888f09d157feae6ce3b8a63cc606d7ed19e364cdb89ccce25a367255b498bbe82862a487c29d8f98d5e31980ef1f0879b06823cedb54801fd54cd461ad  0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch"
+fdbc13888f09d157feae6ce3b8a63cc606d7ed19e364cdb89ccce25a367255b498bbe82862a487c29d8f98d5e31980ef1f0879b06823cedb54801fd54cd461ad  0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+"
diff --git a/main/mesa/add-use-elf-tls.patch b/main/mesa/add-use-elf-tls.patch
index 57babe28fc..629c5ac187 100644
--- a/main/mesa/add-use-elf-tls.patch
+++ b/main/mesa/add-use-elf-tls.patch
@@ -1,22 +1,23 @@
 diff --git a/meson.build b/meson.build
-index 932eb13..a12bdb5 100644
+index e1e94e7..b355f94 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -448,7 +448,8 @@ endif
+@@ -447,7 +447,9 @@ 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', 'haiku'].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
 +with_use_elf_tls = get_option('use-elf-tls')
-+if with_use_elf_tls and not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
++if with_use_elf_tls and
++    (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
- endif
 diff --git a/meson_options.txt b/meson_options.txt
-index fc73f6e..edd3886 100644
+index a7030ab..73bd28e 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -464,3 +464,9 @@ option(
+@@ -465,3 +465,9 @@ option(
    value : true,
    description : 'use msse2 flag for mingw x86. Default: true',
  )
diff --git a/main/mesa/adjust-cache-deflate-buffer.patch b/main/mesa/adjust-cache-deflate-buffer.patch
deleted file mode 100644
index 625f723bac..0000000000
--- a/main/mesa/adjust-cache-deflate-buffer.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru mesa-18.1.7.orig/src/util/disk_cache_os.c mesa-18.1.7/src/util/disk_cache.c
---- mesa-18.1.7.orig/src/util/disk_cache_os.c	2018-08-24 19:25:19.000000000 +0300
-+++ mesa-18.1.7/src/util/disk_cache_os.c	2018-12-14 13:59:15.433631846 +0200
-@@ -45,8 +45,11 @@
- /* From the zlib docs:
-  *    "If the memory is available, buffers sizes on the order of 128K or 256K
-  *    bytes should be used."
-+ *
-+ * But that is performance optimization for large files. To keep stack usage
-+ * in sensible amount (wrt. musl default stack) we use smaller stack on Alpine.
-  */
--#define BUFSIZE 256 * 1024
-+#define BUFSIZE 4 * 1024
- 
- static ssize_t
- write_all(int fd, const void *buf, size_t count);