extra/mesa: fix

This commit is contained in:
Kevin Mihelich 2019-10-03 13:45:36 +00:00
parent a8fa599bed
commit 670d81209a
2 changed files with 19 additions and 6 deletions

View file

@ -1,15 +1,28 @@
From 6c4887f62dcb56eca5fd447f72c16f61628fce54 Mon Sep 17 00:00:00 2001 From b7b9cf45bf8fb3514c1f71b3b5186474069e2575 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org> From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 4 Feb 2019 17:54:45 -0700 Date: Mon, 4 Feb 2019 17:54:45 -0700
Subject: [PATCH] Rip out VC4 forced NEON Subject: [PATCH] Rip out VC4 forced NEON
Breaks with distro-supplied CFLAGS. Breaks with distro-supplied CFLAGS.
--- ---
meson.build | 1 -
src/gallium/drivers/vc4/meson.build | 11 ----------- src/gallium/drivers/vc4/meson.build | 11 -----------
1 file changed, 11 deletions(-) 2 files changed, 12 deletions(-)
diff --git a/meson.build b/meson.build
index 4afd8ca663b..317bf079dbd 100644
--- a/meson.build
+++ b/meson.build
@@ -1009,7 +1009,6 @@ elif host_machine.cpu_family() == 'x86_64'
elif host_machine.cpu_family() == 'arm'
if system_has_kms_drm
with_asm_arch = 'arm'
- pre_args += ['-DUSE_ARM_ASM']
endif
elif host_machine.cpu_family() == 'aarch64'
if system_has_kms_drm
diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build
index 0d7a03cd242..dbf116c2ce1 100644 index 5ce5af5f6b4..9a4197c37b2 100644
--- a/src/gallium/drivers/vc4/meson.build --- a/src/gallium/drivers/vc4/meson.build
+++ b/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build
@@ -84,17 +84,6 @@ files_libvc4 = files( @@ -84,17 +84,6 @@ files_libvc4 = files(
@ -28,8 +41,8 @@ index 0d7a03cd242..dbf116c2ce1 100644
- vc4_c_args += '-DUSE_ARM_ASM' - vc4_c_args += '-DUSE_ARM_ASM'
-endif -endif
dep_simpenrose = dependency('simpenrose', required : false)
if dep_simpenrose.found() if dep_simpenrose.found()
vc4_c_args += '-DUSE_VC4_SIMULATOR'
-- --
2.20.1 2.23.0

View file

@ -25,7 +25,7 @@ source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
intel-topology-query-fix-old-gens.patch) intel-topology-query-fix-old-gens.patch)
sha512sums=('7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0' sha512sums=('7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0'
'SKIP' 'SKIP'
'df13eaff1f3a95821221637c56d482945c42faca789e8bc71c36d0526750863aac891afab9d51ce0a912d7eede5b2af7c14a1c36ebd17c1bde945c3e057b773b' 'ba55fd9816ebd9147be120da1fd4fa0364d19967a11570e6d5dd9d8b4f7971df46ced8b151ee07afaaa98043e131eed14918ec25f8c9b0f7e5c53f452674ee5c'
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7' 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
'3e5746dcd493bff3f04b26de6168b15d0f161de62c1c6657106b61cbb1ad4925cbf3a691d5055491e759f88dbe0362dc909e7d726f87528980662f26ceb6dcbc' '3e5746dcd493bff3f04b26de6168b15d0f161de62c1c6657106b61cbb1ad4925cbf3a691d5055491e759f88dbe0362dc909e7d726f87528980662f26ceb6dcbc'
'a5e2ccef20edc81859255c66cb838c5244774d9d6c56dcfce2e462b6ddaa66ef7847242b050402305621c9c9e706629af30dd27c8466b6bd32d1be40cb3e53a0') 'a5e2ccef20edc81859255c66cb838c5244774d9d6c56dcfce2e462b6ddaa66ef7847242b050402305621c9c9e706629af30dd27c8466b6bd32d1be40cb3e53a0')