diff options
| author | Taner Tas <taner76@gmail.com> | 2018-04-26 03:13:47 +0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-05-09 09:03:56 +0000 |
| commit | 257a236f57bd5db6fc51ae9f9b52c4e24e236596 (patch) | |
| tree | 6f0cc1bbefe2c4aa7b6c3c41cc39e7aaf1e25e92 | |
| parent | 2a822bf7ad052eebfcbfc9f870fc3c0bea9498e3 (diff) | |
| download | aports-257a236f57bd5db6fc51ae9f9b52c4e24e236596.tar.bz2 aports-257a236f57bd5db6fc51ae9f9b52c4e24e236596.tar.xz | |
main/mesa: Removed wayland stuff
in accordance with commit 4f8b36b3d0a8bf9034f433465a276b5658292b76
* musl related patches combined in one file.
| -rw-r--r-- | main/mesa/APKBUILD | 19 | ||||
| -rw-r--r-- | main/mesa/musl-fix-includes.patch | 11 | ||||
| -rw-r--r-- | main/mesa/musl-fixes.patch | 11 |
3 files changed, 15 insertions, 26 deletions
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index 3b4cbb7006..ae07464233 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-dri-virtio:_dri $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles $pkgname-xatracker $pkgname-osmesa $pkgname-gbm - $pkgname-libwayland-egl:_wayland $pkgname-vulkan-ati:_vulkan " _llvmver=5 @@ -22,12 +21,10 @@ depends_dev="libdrm-dev dri2proto libxext-dev libxdamage-dev libxcb-dev glproto dri3proto presentproto libxshmfence-dev" makedepends="$depends_dev expat-dev xextproto python3 libxt-dev makedepend talloc-dev py3-libxml2 flex bison llvm$_llvmver-dev eudev-dev libvdpau-dev - libxvmc-dev gettext zlib-dev wayland-dev libelf-dev py-mako - autoconf automake libtool libxxf86vm-dev libx11-dev libxfixes-dev - wayland-protocols libva-dev" + libxvmc-dev gettext zlib-dev libelf-dev py-mako libva-dev + autoconf automake libtool libxxf86vm-dev libx11-dev libxfixes-dev" source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz glx_ro_text_segm.patch - musl-fixes.patch musl-fix-includes.patch drmdeps.patch " @@ -82,7 +79,7 @@ build() { --with-dri-drivers=${_dri_drivers} \ --with-vulkan-drivers=${_vulkan_drivers} \ --with-llvm-prefix=/usr/lib/llvm$_llvmver \ - --with-platforms=x11,drm,wayland \ + --with-platforms=x11,drm \ --enable-llvm \ --enable-llvm-shared-libs \ --enable-shared-glapi \ @@ -248,13 +245,6 @@ _dri() { esac } -_wayland() { - pkgdesc="Mesa libwayland-egl library" - - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libwayland-egl.so.* "$subpkgdir"/usr/lib/ -} - _vulkan() { local n=${subpkgname##*-vulkan-} pkgdesc="Mesa Vulkan API driver for $n" @@ -268,6 +258,5 @@ _vulkan() { } sha512sums="b0d610904b6f179a27b42aee5f479339e341926915cdc6adb08ac999a4a12539abc3776577e86af83e10381d9703ef1bca70bab81b43daf2c000622c9c3612d2 mesa-18.0.1.tar.xz c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch -9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch -f206c965b60131563ce920341042bdbd6911efe9e9d8edb5422c2c3490b42e903eb2260ba9549184c76a2f4692908706641818609c535efb9ed16f00ee4f6889 musl-fix-includes.patch +910dd69c29b9b51b3b66e975baefbd8a6458500ef3164837036a4ac923c33254d558d678a100025ba2a69fd1111aa6b3ec83f332a66cae4207431e5e1c8ec567 musl-fix-includes.patch 3409483217dbec732286e628e268e1e8cd392b7e8efb13c7651b38e6563aa5a4988279efb029096dcd092ebe7a92eece103014ed420d2b242eab8d0237f056fd drmdeps.patch" diff --git a/main/mesa/musl-fix-includes.patch b/main/mesa/musl-fix-includes.patch index 415e3dd81f..556aa9cd9a 100644 --- a/main/mesa/musl-fix-includes.patch +++ b/main/mesa/musl-fix-includes.patch @@ -9,3 +9,14 @@ #include <unistd.h> #include <fcntl.h> #else +--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig ++++ ./src/gallium/winsys/svga/drm/vmw_screen.h +@@ -34,7 +34,7 @@ + #ifndef VMW_SCREEN_H_ + #define VMW_SCREEN_H_ + +- ++#include <sys/stat.h> + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + diff --git a/main/mesa/musl-fixes.patch b/main/mesa/musl-fixes.patch deleted file mode 100644 index dd3e6bb64a..0000000000 --- a/main/mesa/musl-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig -+++ ./src/gallium/winsys/svga/drm/vmw_screen.h -@@ -34,7 +34,7 @@ - #ifndef VMW_SCREEN_H_ - #define VMW_SCREEN_H_ - -- -+#include <sys/stat.h> - #include "pipe/p_compiler.h" - #include "pipe/p_state.h" - |