From a96999fdcff1034971b105c36065d7cc2f12b4b6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 31 Jul 2020 20:15:55 +0200
Subject: [PATCH] mesa: enable drivers more liberally (AMD on ARM, etc)

---
 srcpkgs/mesa/template | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 7bfb661a15b..d757649e39d 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=20.1.4
-revision=1
+revision=2
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -41,29 +41,23 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 # swrast always present
 _gallium_drivers=" -Dgallium-drivers=swrast"
 _vulkan_drivers=" -Dvulkan-drivers="
-# legacy drivers only on x86 and ppc in general
+# pre-gallium drivers are mostly for old ati + i915/965
 _dri_drivers=" -Ddri-drivers="
 
-# amd drivers only on x86 and ppc
-# this also enables clover opencl
+# amd and nvidia drivers on all platforms except where it makes no sense
+# amd implicitly enables clover opencl, also enable hwdec and virgl too
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|ppc*) _have_amd=yes ;;
-esac
-
-# hardware video decoding on x86, ppc, aarch64
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|ppc*|aarch64*) _have_hwdec=yes ;;
-esac
-
-# most platforms get nvidia and virgl
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|ppc*|armv[67]*|aarch64*)
+	armv5*|mips*) ;;
+	*)
 		_have_nv=yes
+		_have_amd=yes
+		_have_hwdec=yes
 		_have_virgl=yes
 		;;
 esac
 
 # x86 additionally gets intel, vmware and gallium nine
+# arm gets its own drivers (for mali, tegra etc.)
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*)
 		_have_intel=yes