diff options
| -rw-r--r-- | user/mesa/APKBUILD | 20 | ||||
| -rw-r--r-- | user/mesa/amdgpu-pthread-header.patch | 10 | ||||
| -rw-r--r-- | user/mesa/musl-fixes.patch | 11 | ||||
| -rw-r--r-- | user/mesa/python3-compat.patch | 13 |
4 files changed, 34 insertions, 20 deletions
diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index ceb22c20f..bc968fd03 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,11 +1,11 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=17.3.1 +pkgver=18.1.3 pkgrel=1 pkgdesc="Mesa DRI OpenGL library" -url="http://www.mesa3d.org" +url="https://www.mesa3d.org" arch="all" -license="LGPL" +license="MIT AND X11 AND SGI-B-2.0 AND BSL-1.0" depends= subpackages="$pkgname-dev $pkgname-dri-ati:_dri @@ -22,12 +22,13 @@ depends_dev="libdrm-dev dri2proto libxext-dev libxdamage-dev libxcb-dev glproto dri3proto presentproto libxshmfence-dev" makedepends="$depends_dev expat-dev xextproto libxt-dev makedepend py3-mako flex bison llvm$_llvmver-dev eudev-dev libvdpau-dev python3 py-libxml2 - libxvmc-dev gettext zlib-dev wayland-dev libelf-dev wayland-protocols - autoconf automake libtool libxxf86vm-dev libx11-dev libxfixes-dev" + libxvmc-dev libxfixes-dev wayland-dev libelf-dev wayland-protocols + autoconf automake libtool libxxf86vm-dev libx11-dev zlib-dev" source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz glx_ro_text_segm.patch musl-fixes.patch musl-fix-includes.patch + amdgpu-pthread-header.patch disk_cache-stack-overflow.patch drmdeps.patch python3-compat.patch @@ -243,10 +244,11 @@ _wayland() { || return 1 } -sha512sums="a2bd0123bf2df0db03197001a9e001b25f2609f3c6bf1bae66f3bc50c51d2558b5b77e232e81c1658c3a4dec88eda32a8b5a85c1fedc937a7441476228ef8238 mesa-17.3.1.tar.xz +sha512sums="f6e5b81a80a309a36a04759d18364d3c71c48d1cb88f87b2f5432ef003092a22046e88ce2082031d5d52b60ba36f585d8df52e06ecc7a5158079936236f36887 mesa-18.1.3.tar.xz c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch -edb9c221b093117f48fa298ae557f1d6ed9bbf32d7d262ad4ddb51d26ece94e3efac17670784606052b2ebe8d3dc2b221164f6b52f5282eb3318e6377932be04 musl-fixes.patch +9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch +245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch f40ff04ac73c090c74d1955de6013c5aa41fb77f28b2b82d89cfc1880306a9ca1dde4581592db19f0a0ec6d85032f1ed5d953103ab0d075f9f0b7e459a028c45 disk_cache-stack-overflow.patch 6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch -be91c579111e4ceadf094fcd55fff46ff12c360e2d89c98fac50fbd3bb2459dbd1209d562d27338b94b20bbeae5fca2dd881694bd0da55fca8cdfe253ae384f1 python3-compat.patch" +61ddf4f33f11b4fbaa334bec04d184236f01bc8cad4340cb74b66c92fc8c0c985d36507cf43b504d186dc108fc2e5ae348ed28ea8a680ba4dfdb74994fc440f7 python3-compat.patch" diff --git a/user/mesa/amdgpu-pthread-header.patch b/user/mesa/amdgpu-pthread-header.patch new file mode 100644 index 000000000..576d57ffc --- /dev/null +++ b/user/mesa/amdgpu-pthread-header.patch @@ -0,0 +1,10 @@ +--- mesa-18.1.3/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h.old 2018-06-29 17:47:29.000000000 +0000 ++++ mesa-18.1.3/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h 2018-07-09 02:13:04.590000000 +0000 +@@ -28,6 +28,7 @@ + #ifndef RADV_AMDGPU_WINSYS_H + #define RADV_AMDGPU_WINSYS_H + ++#include <pthread.h> + #include "radv_radeon_winsys.h" + #include "ac_gpu_info.h" + #include "addrlib/addrinterface.h" diff --git a/user/mesa/musl-fixes.patch b/user/mesa/musl-fixes.patch index 60140d445..dd3e6bb64 100644 --- a/user/mesa/musl-fixes.patch +++ b/user/mesa/musl-fixes.patch @@ -9,14 +9,3 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" ---- a/src/util/u_endian.h.orig 2016-11-04 12:16:00.480356454 +0100 -+++ b/src/util/u_endian.h 2016-11-04 12:16:11.984347944 +0100 -@@ -27,7 +27,7 @@ - #ifndef U_ENDIAN_H - #define U_ENDIAN_H - --#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__) -+#if defined(__linux__) || defined(ANDROID) || defined(__CYGWIN__) - #include <endian.h> - - #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/user/mesa/python3-compat.patch b/user/mesa/python3-compat.patch index 8532f8c0c..9dc213e9f 100644 --- a/user/mesa/python3-compat.patch +++ b/user/mesa/python3-compat.patch @@ -104,3 +104,16 @@ def main(): +--- mesa-18.1.3/m4/ax_check_python_mako_module.m4.old 2018-06-29 17:47:29.000000000 +0000 ++++ mesa-18.1.3/m4/ax_check_python_mako_module.m4 2018-07-09 01:55:22.740000000 +0000 +@@ -48,8 +48,8 @@ + except ImportError as err: + sys.exit(err) + else: +- ver_req = map(int, '$1'.split('.')) +- ver_act = map(int, mako.__version__.split('.')) ++ ver_req = list(map(int, '$1'.split('.'))) ++ ver_act = list(map(int, mako.__version__.split('.'))) + sys.exit(int(ver_req > ver_act)) + " | $PYTHON2 - + |