Commit a2fbd831 authored by Leo's avatar Leo
Browse files

main/mesa: upgrade to 21.0.1

parent 567945ef
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mesa
pkgver=20.3.5
pkgver=21.0.1
pkgrel=0
pkgdesc="Mesa DRI OpenGL library"
url="https://www.mesa3d.org"
......@@ -95,7 +95,7 @@ x86*)
$pkgname-vulkan-intel:_vulkan
$pkgname-vulkan-layer:_vulkan_layer"
_gallium_provides="$_gallium_provides $pkgname-dri-vmwgfx=$pkgver-r$pkgrel"
_arch_opts="-Ddri3=true"
_arch_opts="-Ddri3=enabled"
case "$CARCH" in
x86)
_arch_opts="$_arch_opts -Dglx-read-only-text=true -Dasm=false";;
......@@ -129,20 +129,20 @@ build() {
-Dvulkan-drivers=$_vulkan_drivers \
-Dvulkan-overlay-layer=$_vulkan_overlay_layer \
-Dplatforms=x11,wayland \
-Dllvm=true \
-Dshared-llvm=true \
-Dshared-glapi=true \
-Dgbm=true \
-Dllvm=enabled \
-Dshared-llvm=enabled \
-Dshared-glapi=enabled \
-Dgbm=enabled \
-Dglx=dri \
-Dopengl=true \
-Dosmesa=gallium \
-Dgles1=false \
-Dgles2=true \
-Degl=true \
-Dgallium-xa=true \
-Dgallium-vdpau=true \
-Dgallium-va=true \
-Dgallium-xvmc=false \
-Dosmesa=true \
-Dgles1=disabled \
-Dgles2=enabled \
-Degl=enabled \
-Dgallium-xa=enabled \
-Dgallium-vdpau=enabled \
-Dgallium-va=enabled \
-Dgallium-xvmc=disabled \
-Dgallium-nine=false \
-Db_ndebug=true \
$_arch_opts \
......@@ -323,9 +323,9 @@ _vulkan_layer() {
mv "$pkgdir"/usr/bin/mesa-overlay-control.py "$subpkgdir"/usr/bin
}
sha512sums="481e710ed80d8f215a8d541cfe51b960862c2403c2b9e7e6932c8236b8decb5d478871d6c73559d6d795ada143803764f3a93b2329588c80f62e2e5ec98c78a9 mesa-20.3.5.tar.xz
sha512sums="b31b78778b6092dfaf0712f90de3074217574389c4236f8379c127739874f6bd1b47883140a26445d25e58df87e6207278efd048453096ee710d334b1dcfe419 mesa-21.0.1.tar.xz
adb6ccac89bc5a382689db615184b7b36a267001e8e27f951e68020e45edd318fc278408c9eae922a74db3df3d98d52f13119d4e3691be38bd05e6a57348103e adjust-cache-deflate-buffer.patch
77b40d3b70a78e1f261f0a0358f3b5f15d5f0a6d51ba317e38053f426a14487a459743df2e4734e9c086f1f083572e78279eb8a5dde191ef0c2914594513194b musl-fix-includes.patch
ed65ff134022f839f1395f51683d1bb2e61586163516bf104450c96707b7071d80475c2f2d905b77892658257fdfea040a84b6d9b8b23d669924ebd5d7eca055 add-use-elf-tls.patch
bebf9f725d49da3de665b69e2ddf4b3006000f59afa47f4a2a3c1d1c552d86bbfcb88e92532172c2f898c3a416b4b1735b6ae7deeb2578660141437f74112784 add-use-elf-tls.patch
efdb49daf7daa173a349785497c2d908f3140ce133d84ef9b2b983afdafda8ee853b3edcd96889b614cc0477e076c7ba2cea4b409f396df3da0561534975459b disable-rgb10-by-default.patch
fdbc13888f09d157feae6ce3b8a63cc606d7ed19e364cdb89ccce25a367255b498bbe82862a487c29d8f98d5e31980ef1f0879b06823cedb54801fd54cd461ad 0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch"
diff --git a/meson.build b/meson.build
index 76f72a9df7c..2802467f70e 100644
index 932eb13..a12bdb5 100644
--- a/meson.build
+++ b/meson.build
@@ -437,7 +437,8 @@ endif
@@ -448,7 +448,8 @@ 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 ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+with_use_elf_tls = get_option('use-elf-tls')
+if with_use_elf_tls and not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+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)
pre_args += '-DUSE_ELF_TLS'
use_elf_tls = true
endif
diff --git a/meson_options.txt b/meson_options.txt
index bf031eeb11f..46bd7c4d898 100644
index fc73f6e..edd3886 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -406,3 +406,9 @@ option(
value : 'auto',
description : 'Use ZSTD instead of ZLIB in some cases.'
@@ -464,3 +464,9 @@ option(
value : true,
description : 'use msse2 flag for mingw x86. Default: true',
)
+option(
+ 'use-elf-tls',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment