diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-26 05:22:06 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-26 05:22:06 +0000 |
| commit | 751d5f281eecfecd9e5b9e72b44b03415811fc67 (patch) | |
| tree | ca3929d5155241cd5383075e70515276cb0470a0 | |
| parent | 0fda0aaec7ec6c3d4609158bc3719eac9aa1c9b4 (diff) | |
| download | packages-751d5f281eecfecd9e5b9e72b44b03415811fc67.tar.gz packages-751d5f281eecfecd9e5b9e72b44b03415811fc67.tar.bz2 packages-751d5f281eecfecd9e5b9e72b44b03415811fc67.tar.xz packages-751d5f281eecfecd9e5b9e72b44b03415811fc67.zip | |
user/mesa: Bump to 19.3.2, kill TLS with extreme prejudice
| -rw-r--r-- | user/mesa/APKBUILD | 15 | ||||
| -rw-r--r-- | user/mesa/no-tls.patch | 14 |
2 files changed, 24 insertions, 5 deletions
diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index 474f7c50b..3cdfd1cd8 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=19.3.1 +pkgver=19.3.2 _llvmver=8 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" @@ -23,6 +23,7 @@ source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz amdgpu-pthread-header.patch musl-fixes.patch musl-fix-includes.patch + no-tls.patch " _dri_driverdir=/usr/lib/xorg/modules/dri @@ -31,10 +32,14 @@ _gallium_drivers="r300,r600,radeonsi,nouveau,freedreno,swrast,virgl" _vulkan_drivers="amd" case "$CARCH" in +x86_64) + _vulkan_drivers="${_vulkan_drivers},intel" + ;; +esac +case "$CARCH" in x86* | pmmx) _dri_drivers="${_dri_drivers},i965" _gallium_drivers="${_gallium_drivers},i915,svga" - _vulkan_drivers="${_vulkan_drivers},intel" ;; aarch64 | arm*) _gallium_drivers="${_gallium_drivers},vc4,freedreno,tegra,kmsro,v3d,lima,panfrost,etnaviv" @@ -56,7 +61,6 @@ build() { -Dgallium-drivers=$_gallium_drivers \ -Dvulkan-drivers=$_vulkan_drivers \ -Dosmesa=gallium \ - -Duse-elf-tls=false \ $_arch_conf \ build @@ -147,7 +151,8 @@ dri() { mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/ } -sha512sums="338d2e37122ef22cc4e27a2f3c39e23e419703a507ace99383c749a563936c5f0428cce9a68ac80d0bd2ff57be8a55f42aee0ed6d16bf6b77b4e59d428729568 mesa-19.3.1.tar.xz +sha512sums="fb69999fa7a15cd6f2c254fb6e8fe635e56dc49a5c2c762a96c77815cbad77060b8f81a02e67ac9ec58092ab866e080fb928086a5ac1e61c3efe882e5825cd28 mesa-19.3.2.tar.xz 245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch -c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch" +c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch +56e829b0570cf5215c191330a5162356b77eeb555eb8127e30da57bdff9d369c1bb3de3bd7ee36233d6d610c0cec81773879da05cc0b391e06ff4d7507bef8a8 no-tls.patch" diff --git a/user/mesa/no-tls.patch b/user/mesa/no-tls.patch new file mode 100644 index 000000000..b5e0b3adb --- /dev/null +++ b/user/mesa/no-tls.patch @@ -0,0 +1,14 @@ +--- mesa-19.3.1/meson.build.old 2019-12-18 18:36:00.000000000 +0000 ++++ mesa-19.3.1/meson.build 2020-01-26 05:11:44.774286868 +0000 +@@ -386,11 +386,6 @@ + endif + endif + +-# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. +-if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29) +- pre_args += '-DUSE_ELF_TLS' +-endif +- + if with_glx != 'disabled' + if not (with_platform_x11 and with_any_opengl) + error('Cannot build GLX support without X11 platform support and at least one OpenGL API') |