diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-30 02:31:34 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-30 02:31:34 +0000 |
| commit | f6caa991daa3fbd8e1c6eefda478d7ce22554f3b (patch) | |
| tree | 071436323696f4d34a6494f9caa842cf7cc8fcf4 | |
| parent | 22e505a37817140d7142255c0c440ba8951f24b6 (diff) | |
| download | packages-f6caa991daa3fbd8e1c6eefda478d7ce22554f3b.tar.gz packages-f6caa991daa3fbd8e1c6eefda478d7ce22554f3b.tar.bz2 packages-f6caa991daa3fbd8e1c6eefda478d7ce22554f3b.tar.xz packages-f6caa991daa3fbd8e1c6eefda478d7ce22554f3b.zip | |
user/mesa: Bump to 19.3.3, fix Vulkan build on Intel 32
| -rw-r--r-- | user/mesa/APKBUILD | 12 | ||||
| -rw-r--r-- | user/mesa/intel-vulkan.patch | 26 |
2 files changed, 31 insertions, 7 deletions
diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index 3cdfd1cd8..c1f74e159 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=19.3.2 +pkgver=19.3.3 _llvmver=8 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" @@ -21,6 +21,7 @@ subpackages="$pkgname-dev $pkgname-dri # requires glslang: $pkgname-vulkan-overlay source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz amdgpu-pthread-header.patch + intel-vulkan.patch musl-fixes.patch musl-fix-includes.patch no-tls.patch @@ -32,14 +33,10 @@ _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" @@ -151,8 +148,9 @@ dri() { mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/ } -sha512sums="fb69999fa7a15cd6f2c254fb6e8fe635e56dc49a5c2c762a96c77815cbad77060b8f81a02e67ac9ec58092ab866e080fb928086a5ac1e61c3efe882e5825cd28 mesa-19.3.2.tar.xz +sha512sums="1f792fbde71132afd4a43d6abe6a3d640f375e83641c6144c82312774434c9588ffba65a3ba38394947bd753656aa85213b6cd9f745cec0040c0559eb41f0dc9 mesa-19.3.3.tar.xz 245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch +ba954ea9aa49e5cdfec08f310f41abf09e01a2a889a09b6c32a154b750d3ebb2bfb5a9b7d244c06d26442688aeeb7f212f5f3c98c6db69f878098a49d476ff70 intel-vulkan.patch 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch 56e829b0570cf5215c191330a5162356b77eeb555eb8127e30da57bdff9d369c1bb3de3bd7ee36233d6d610c0cec81773879da05cc0b391e06ff4d7507bef8a8 no-tls.patch" diff --git a/user/mesa/intel-vulkan.patch b/user/mesa/intel-vulkan.patch new file mode 100644 index 000000000..6ba03d6d1 --- /dev/null +++ b/user/mesa/intel-vulkan.patch @@ -0,0 +1,26 @@ +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 + |