archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-01-17 23:34:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/mesa: fixes

Browse source
This commit is contained in:
Kevin Mihelich 2021-08-20 23:49:13 +00:00
parent 4d96d7fcc2
commit a48b7082a8
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
extra/mesa/0001-Rip-out-VC4-forced-NEON.patch
View file

@ -1,4 +1,4 @@
From b74a5ce07eab6b8272fdde4a0ea502ad8fc11cfd Mon Sep 17 00:00:00 2001
From 23cbe6d5c1076551540159ce617ad0680b02a029 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 4 Feb 2019 17:54:45 -0700
Subject: [PATCH] Rip out VC4 forced NEON
@ -6,14 +6,15 @@ Subject: [PATCH] Rip out VC4 forced NEON
Breaks with distro-supplied CFLAGS.
---
meson.build | 1 -
src/broadcom/meson.build | 5 +----
src/gallium/drivers/vc4/meson.build | 11 -----------
2 files changed, 12 deletions(-)
3 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/meson.build b/meson.build
index 9eb7f9221ea..3f3c4f81873 100644
index 155db287796..ff703e8e631 100644
--- a/meson.build
+++ b/meson.build
@@ -1231,7 +1231,6 @@ elif host_machine.cpu_family() == 'x86_64'
@@ -1282,7 +1282,6 @@ elif host_machine.cpu_family() == 'x86_64'
elif host_machine.cpu_family() == 'arm'
if system_has_kms_drm
with_asm_arch = 'arm'
@ -21,6 +22,24 @@ index 9eb7f9221ea..3f3c4f81873 100644
endif
elif host_machine.cpu_family() == 'aarch64'
if system_has_kms_drm
diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index 2e1145dd0c0..c6266af9654 100644
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -50,12 +50,9 @@ foreach ver : v3d_versions
)
endforeach
-v3d_args = ['-DV3D_BUILD_NEON']
+v3d_args = []
v3d_neon_c_args = []
-if host_machine.cpu_family() == 'arm'
- v3d_neon_c_args = '-mfpu=neon'
-endif
libv3d_neon = static_library(
'v3d_neon',
diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build
index 90a772d5dc6..3074933584c 100644
--- a/src/gallium/drivers/vc4/meson.build
@ -44,5 +63,5 @@ index 90a772d5dc6..3074933584c 100644
if dep_simpenrose.found()
vc4_c_args += '-DUSE_VC4_SIMULATOR'
--
2.30.1
2.30.0

10
extra/mesa/PKGBUILD
View file

@ -27,7 +27,7 @@ source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
LICENSE)
sha512sums=('d4056287ec86f7a95ce534a251a1ccbc3a3b08a2f7112152def2f054fc8a9424501d5883c463554ee95fe2dafb832613efd7145e989ee8281948233942730c2c'
'SKIP'
'57e23d911d3de9bb4021d3d417270483d6edd53a81ad2d59b4e9cf2a9970901cde582b4a2167ee6d9ed47bd9ca90c3abd4e7cee38c028ad5ad183493560e7faf'
'4cd472e3db19b658265cbbeae6b23be6b5bbf54380c64963f867aa3991de4700b48aae23718283aae4608e8e73627a0103862adbbae9ce17a00a266e425e948c'
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov@gmail.com>
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty@igalia.com>
@ -39,11 +39,13 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
prepare() {
cd mesa-$pkgver
[[ $CARCH == "armv6h" || $CARCH == "armv7h" ]] && patch -p1 -i ../0001-Rip-out-VC4-forced-NEON.patch || true
if [[ $CARCH != "aarch64" ]]; then
patch -p1 -i ../0001-Rip-out-VC4-forced-NEON.patch
CPPFLAGS+=" -DNO_FORMAT_ASM"
fi
}
build() {
MESON_OPT="-D asm=false"
case "${CARCH}" in
armv6h) GALLIUM=",vc4" ;;
armv7h) GALLIUM=",etnaviv,kmsro,lima,panfrost,tegra,v3d,vc4" ;;
@ -79,7 +81,7 @@ build() {
-D osmesa=true \
-D shared-glapi=enabled \
-D microsoft-clc=disabled \
-D valgrind=disabled $MESON_OPT
-D valgrind=disabled
# Print config
meson configure build