diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-26 03:04:20 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-26 03:04:20 +0000 |
| commit | 4725a4d40a085ee4e6987309a4eb5e570a1a6d4a (patch) | |
| tree | c0b2f3ba2c61accbb9ebc54f9b9e9c837e74cd90 /user | |
| parent | f47db32429e4a86d4bbfc7b041f7cf541159e71c (diff) | |
| download | packages-4725a4d40a085ee4e6987309a4eb5e570a1a6d4a.tar.gz packages-4725a4d40a085ee4e6987309a4eb5e570a1a6d4a.tar.bz2 packages-4725a4d40a085ee4e6987309a4eb5e570a1a6d4a.tar.xz packages-4725a4d40a085ee4e6987309a4eb5e570a1a6d4a.zip | |
user/mesa: Bump to 19.3.4; fix time64 issues on ARMv7
Diffstat (limited to 'user')
| -rw-r--r-- | user/mesa/APKBUILD | 10 | ||||
| -rw-r--r-- | user/mesa/time64.patch | 34 |
2 files changed, 40 insertions, 4 deletions
diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index b6d37ceab..8ae8cca81 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=19.3.3 +pkgver=19.3.4 _llvmver=8 -pkgrel=1 +pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" arch="all" @@ -25,6 +25,7 @@ source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz musl-fixes.patch musl-fix-includes.patch no-tls.patch + time64.patch " _dri_driverdir=/usr/lib/xorg/modules/dri @@ -151,9 +152,10 @@ dri() { mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/ } -sha512sums="1f792fbde71132afd4a43d6abe6a3d640f375e83641c6144c82312774434c9588ffba65a3ba38394947bd753656aa85213b6cd9f745cec0040c0559eb41f0dc9 mesa-19.3.3.tar.xz +sha512sums="2bbb3dc8f1d839f11fe12cc959393cd69607fa6714b2166b80299e0559d2d3b0ac38ed4e15ac3e5f472264eb24536d1901d350f7409f3a7e00d6f4ccbb2312fb mesa-19.3.4.tar.xz 245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch ba954ea9aa49e5cdfec08f310f41abf09e01a2a889a09b6c32a154b750d3ebb2bfb5a9b7d244c06d26442688aeeb7f212f5f3c98c6db69f878098a49d476ff70 intel-vulkan.patch 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch -56e829b0570cf5215c191330a5162356b77eeb555eb8127e30da57bdff9d369c1bb3de3bd7ee36233d6d610c0cec81773879da05cc0b391e06ff4d7507bef8a8 no-tls.patch" +56e829b0570cf5215c191330a5162356b77eeb555eb8127e30da57bdff9d369c1bb3de3bd7ee36233d6d610c0cec81773879da05cc0b391e06ff4d7507bef8a8 no-tls.patch +0aad2fdc56ea8825533746ee4c2c803734f871e04da13ddd461b2de36716ba52e345e745a6861ffae62efacf6b64f629187ddda3c01e3d880ce20c0ac551dccb time64.patch" diff --git a/user/mesa/time64.patch b/user/mesa/time64.patch new file mode 100644 index 000000000..7e7894a9d --- /dev/null +++ b/user/mesa/time64.patch @@ -0,0 +1,34 @@ +--- mesa-19.3.1/src/gallium/drivers/vc4/vc4_bufmgr.c.old 2019-12-18 18:36:00.000000000 +0000 ++++ mesa-19.3.1/src/gallium/drivers/vc4/vc4_bufmgr.c 2020-01-20 19:26:36.470000000 +0000 +@@ -107,8 +107,8 @@ + + struct timespec time; + clock_gettime(CLOCK_MONOTONIC, &time); +- fprintf(stderr, " now: %ld\n", +- time.tv_sec); ++ fprintf(stderr, " now: %"PRId64"\n", ++ (int64_t)time.tv_sec); + } + } + +--- mesa-19.3.1/src/gallium/drivers/v3d/v3d_bufmgr.c.old 2019-12-18 18:36:00.000000000 +0000 ++++ mesa-19.3.1/src/gallium/drivers/v3d/v3d_bufmgr.c 2020-01-20 19:28:02.600000000 +0000 +@@ -23,6 +23,7 @@ + + #include <errno.h> + #include <err.h> ++#include <inttypes.h> + #include <sys/mman.h> + #include <fcntl.h> + #include <xf86drm.h> +@@ -80,8 +81,8 @@ + + struct timespec time; + clock_gettime(CLOCK_MONOTONIC, &time); +- fprintf(stderr, " now: %ld\n", +- time.tv_sec); ++ fprintf(stderr, " now: %"PRId64"\n", ++ (int64_t)time.tv_sec); + } + } + |