main/mesa: downgrade to 19.3.4

1 files changed, 24 insertions, 17 deletions

diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 23090ca519..696b062227 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=20.0.2
-pkgrel=1
+# Mesa 20.x has bugged graphics, try glxgears or steam flatpak
+pkgver=19.3.4
+pkgrel=2
 pkgdesc="Mesa DRI OpenGL library"
 url="https://www.mesa3d.org"
 arch="all"
@@ -92,7 +93,7 @@ x86*)
 	makedepends="$makedepends glslang"
 	subpackages="$subpackages \
 			$pkgname-dri-intel:_dri_deprecated \
-			$pkgname-vulkan-intel:_vulkan \
+			$pkgname-vulkan-intel:_vulkan
 			$pkgname-vulkan-layer:_vulkan_layer"
 	_gallium_provides="$_gallium_provides $pkgname-dri-vmwgfx=$pkgver-r$pkgrel"
 	_arch_opts="-Ddri3=true"
@@ -166,7 +167,7 @@ package() {
 
 egl() {
 	pkgdesc="Mesa libEGL runtime libraries"
-	depends="mesa"
+	depends="mesa=$pkgver-r$pkgrel"
 
 	install -d "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libEGL.so* "$subpkgdir"/usr/lib/
@@ -174,7 +175,7 @@ egl() {
 
 gl() {
 	pkgdesc="Mesa libGL runtime libraries"
-	depends="mesa"
+	depends="mesa=$pkgver-r$pkgrel"
 
 	install -d "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libGL.so* "$subpkgdir"/usr/lib/
@@ -182,7 +183,7 @@ gl() {
 
 glapi() {
 	pkgdesc="Mesa shared glapi"
-	replaces="$pkgname-gles"
+	replaces="$pkgname-gles=$pkgver-r$pkgrel"
 
 	install -d "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libglapi.so.* "$subpkgdir"/usr/lib/
@@ -190,7 +191,7 @@ glapi() {
 
 gles() {
 	pkgdesc="Mesa libGLESv2 runtime libraries"
-	depends="mesa"
+	depends="mesa=$pkgver-r$pkgrel"
 
 	install -d "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libGLES*.so* "$subpkgdir"/usr/lib/
@@ -198,7 +199,7 @@ gles() {
 
 xatracker() {
 	pkgdesc="Mesa XA state tracker for vmware"
-	depends="mesa"
+	depends="mesa=$pkgver-r$pkgrel"
 
 	install -d "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libxatracker*.so.* "$subpkgdir"/usr/lib/
@@ -206,7 +207,7 @@ xatracker() {
 
 osmesa() {
 	pkgdesc="Mesa offscreen rendering libraries"
-	depends="mesa"
+	depends="mesa=$pkgver-r$pkgrel"
 
 	install -d "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libOSMesa.so.* "$subpkgdir"/usr/lib/
@@ -214,7 +215,7 @@ osmesa() {
 
 gbm() {
 	pkgdesc="Mesa gbm library"
-	depends="mesa"
+	depends="mesa=$pkgver-r$pkgrel"
 
 	install -d "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libgbm.so.* "$subpkgdir"/usr/lib/
@@ -247,7 +248,7 @@ _mv_vulkan() {
 _dri() {
 	local n=${subpkgname##*-dri-}
 	pkgdesc="Mesa $n DRI drivers"
-	depends="mesa"
+	depends="mesa=$pkgver-r$pkgrel"
 
 	case $n in
 	classic)
@@ -265,7 +266,10 @@ _dri() {
 _dri_deprecated() {
 	local n=${subpkgname##*-dri-}
 	pkgdesc="Mesa DRI drivers for $n (DEPRECATED)"
-	depends="mesa-dri-classic mesa-dri-gallium"
+	depends="
+		mesa-dri-classic=$pkgver-r$pkgrel
+		mesa-dri-gallium=$pkgver-r$pkgrel
+		"
 
 	case $n in
 	ati|nouveau)
@@ -278,7 +282,7 @@ _dri_deprecated() {
 _va() {
 	local n=${subpkgname##*-va-}
 	pkgdesc="Mesa $n VAAPI drivers"
-	depends="mesa libva"
+	depends="mesa=$pkgver-r$pkgrel libva"
 
 	case $n in
 	gallium)
@@ -290,7 +294,7 @@ _va() {
 _vdpau() {
 	local n=${subpkgname##*-vdpau-}
 	pkgdesc="Mesa $n VDPAU drivers"
-	depends="mesa libvdpau"
+	depends="mesa=$pkgver-r$pkgrel libvdpau"
 
 	case $n in
 	gallium)
@@ -302,7 +306,7 @@ _vdpau() {
 _vulkan() {
 	local n=${subpkgname##*-vulkan-}
 	pkgdesc="Mesa Vulkan API driver for $n"
-	depends="mesa"
+	depends="mesa=$pkgver-r$pkgrel"
 
 	case $n in
 	ati)
@@ -314,14 +318,17 @@ _vulkan() {
 
 _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
+
+	# Uncomment on mesa 20.x.x
+	# mv "$pkgdir"/usr/bin/mesa-overlay-control.py "$subpkgdir"/usr/bin
 }
 
-sha512sums="d6ffc29bbc5b908cb0f08fa1b5a83e029b76c7b697c488a73e6bb60990a55beeb3ecdba1745868f6885ee2f660975f5debf7d2c9418e0a96e2f7049e83fd89ab  mesa-20.0.2.tar.xz
+sha512sums="2bbb3dc8f1d839f11fe12cc959393cd69607fa6714b2166b80299e0559d2d3b0ac38ed4e15ac3e5f472264eb24536d1901d350f7409f3a7e00d6f4ccbb2312fb  mesa-19.3.4.tar.xz
 cdf22d2da3328e116c379264886bd01fd3ad5cc45fe03dc6fd97bdc4794502598ee195c0b9d975fa264d6ac31c6fa108c0535c91800ecf4fcabfd308e53074cc  adjust-cache-deflate-buffer.patch
 cf849044d6cc7d2af4ff015208fb09d70bf9660538699797da21bda2ecb7c1892d312af83d05116afd826708d9caafb1d05a13f09139c558aea6fee931e3eee7  musl-fix-includes.patch
 9aa207a38d538abbd8e7a7210e3081508563e85e8c27b2269b8f40fd62d9fc6fee0cb2f573a0e62c42f8ba0fb85740459b761f009d5991cfd9813d7614541908  add-use-elf-tls.patch