mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-07 14:27:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/mesa: Removed wayland stuff

Browse Source 
in accordance with commit 4f8b36b3d0

* musl related patches combined in one file.
This commit is contained in:
Taner Tas 2018-04-26 03:13:47 +03:00 committed by Natanael Copa
parent 2a822bf7ad
commit 257a236f57
3 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main/mesa/APKBUILD
View File

@ -14,7 +14,6 @@ subpackages="$pkgname-dev
$pkgname-dri-virtio:_dri $pkgname-dri-virtio:_dri
$pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles
$pkgname-xatracker $pkgname-osmesa $pkgname-gbm $pkgname-xatracker $pkgname-osmesa $pkgname-gbm
$pkgname-libwayland-egl:_wayland
$pkgname-vulkan-ati:_vulkan $pkgname-vulkan-ati:_vulkan
" "
_llvmver=5 _llvmver=5
@ -22,12 +21,10 @@ depends_dev="libdrm-dev dri2proto libxext-dev libxdamage-dev libxcb-dev glproto
dri3proto presentproto libxshmfence-dev" dri3proto presentproto libxshmfence-dev"
makedepends="$depends_dev expat-dev xextproto python3 libxt-dev makedepend makedepends="$depends_dev expat-dev xextproto python3 libxt-dev makedepend
talloc-dev py3-libxml2 flex bison llvm$_llvmver-dev eudev-dev libvdpau-dev talloc-dev py3-libxml2 flex bison llvm$_llvmver-dev eudev-dev libvdpau-dev
libxvmc-dev gettext zlib-dev wayland-dev libelf-dev py-mako libxvmc-dev gettext zlib-dev libelf-dev py-mako libva-dev
autoconf automake libtool libxxf86vm-dev libx11-dev libxfixes-dev autoconf automake libtool libxxf86vm-dev libx11-dev libxfixes-dev"
wayland-protocols libva-dev"
source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
glx_ro_text_segm.patch glx_ro_text_segm.patch
musl-fixes.patch
musl-fix-includes.patch musl-fix-includes.patch
drmdeps.patch drmdeps.patch
" "
@ -82,7 +79,7 @@ build() {
--with-dri-drivers=${_dri_drivers} \ --with-dri-drivers=${_dri_drivers} \
--with-vulkan-drivers=${_vulkan_drivers} \ --with-vulkan-drivers=${_vulkan_drivers} \
--with-llvm-prefix=/usr/lib/llvm$_llvmver \ --with-llvm-prefix=/usr/lib/llvm$_llvmver \
--with-platforms=x11,drm,wayland \ --with-platforms=x11,drm \
--enable-llvm \ --enable-llvm \
--enable-llvm-shared-libs \ --enable-llvm-shared-libs \
--enable-shared-glapi \ --enable-shared-glapi \
@ -248,13 +245,6 @@ _dri() {
esac esac
} }
_wayland() {
pkgdesc="Mesa libwayland-egl library"
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/libwayland-egl.so.* "$subpkgdir"/usr/lib/
}
_vulkan() { _vulkan() {
local n=${subpkgname##*-vulkan-} local n=${subpkgname##*-vulkan-}
pkgdesc="Mesa Vulkan API driver for $n" pkgdesc="Mesa Vulkan API driver for $n"
@ -268,6 +258,5 @@ _vulkan() {
} }
sha512sums="b0d610904b6f179a27b42aee5f479339e341926915cdc6adb08ac999a4a12539abc3776577e86af83e10381d9703ef1bca70bab81b43daf2c000622c9c3612d2 mesa-18.0.1.tar.xz sha512sums="b0d610904b6f179a27b42aee5f479339e341926915cdc6adb08ac999a4a12539abc3776577e86af83e10381d9703ef1bca70bab81b43daf2c000622c9c3612d2 mesa-18.0.1.tar.xz
c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch
9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch 910dd69c29b9b51b3b66e975baefbd8a6458500ef3164837036a4ac923c33254d558d678a100025ba2a69fd1111aa6b3ec83f332a66cae4207431e5e1c8ec567 musl-fix-includes.patch
f206c965b60131563ce920341042bdbd6911efe9e9d8edb5422c2c3490b42e903eb2260ba9549184c76a2f4692908706641818609c535efb9ed16f00ee4f6889 musl-fix-includes.patch
3409483217dbec732286e628e268e1e8cd392b7e8efb13c7651b38e6563aa5a4988279efb029096dcd092ebe7a92eece103014ed420d2b242eab8d0237f056fd drmdeps.patch" 3409483217dbec732286e628e268e1e8cd392b7e8efb13c7651b38e6563aa5a4988279efb029096dcd092ebe7a92eece103014ed420d2b242eab8d0237f056fd drmdeps.patch"

11
main/mesa/musl-fix-includes.patch
View File

@ -9,3 +9,14 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#else #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"

11
main/mesa/musl-fixes.patch
View File

@ -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"