From a465e336f7d978a0e1a5a7c4bd7bcaa057f290b8 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Fri, 27 Dec 2019 23:26:58 +0100
Subject: [PATCH] mesa: fix mesa-*-dri 32bit pkg generation

---
 srcpkgs/mesa/template | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 884aa3eac21..c302e7c32c6 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=19.3.1
-revision=2
+revision=3
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -199,6 +199,7 @@ mesa-opencl_package() {
 mesa-dri_package() {
 	short_desc="Mesa DRI drivers"
 	depends="mesa-${version}_${revision}"
+	shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
 	nostrip_files="armada-drm_dri.so etnaviv_dri.so exynos_dri.so
 	 hx8357d_dri.so i915_dri.so i965_dri.so ili9225_dri.so ili9341_dri.so
 	 imx-drm_dri.so kgsl_dri.so kms_swrast_dri.so lima_dri.so meson_dri.so
@@ -271,72 +272,84 @@ mesa-vulkan-overlay-layer_package() {
 
 mesa-ati-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC mesa-vulkan-radeon"
 }
 
 mesa-etnaviv-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Vivante GPUs (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-freedreno-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Adreno GPUs (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-intel-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-intel"
 }
 
 mesa-kmsro-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="KMS Render-only Mesa DRI drivers (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-lima-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Mali GPUs (Utgard) (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-nouveau-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC"
 }
 
 mesa-panfrost-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Mali GPUs (Midgard/Bifrost) (dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-tegra-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Tegra GPU (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-v3d-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Videocore VI GPU (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-vmwgfx-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for VMware (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-vc4-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Videocore IV GPU (transitional dummy package)"
 	depends="mesa-dri"
 }