From 5a703a38e75f4418fff96dbd057868d963bf260c Mon Sep 17 00:00:00 2001
From: Koichiro Iwao <meta@almalinux.org>
Date: Tue, 25 Jun 2024 09:28:58 +0900
Subject: [PATCH] Enable v3d, vc4 for Raspberry Pi graphics

Resolves: https://github.com/AlmaLinux/raspberry-pi/issues/32
---
 SPECS/mesa.spec | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/SPECS/mesa.spec b/SPECS/mesa.spec
index 6896216..ed4ae76 100644
--- a/SPECS/mesa.spec
+++ b/SPECS/mesa.spec
@@ -23,6 +23,11 @@
 
 %ifarch %{arm} aarch64
 %define with_xa        1
+# RHEL doesn't ship vc4 and v3d but we do for RPi
+%if 0%{?almalinux}
+%define with_v3d 1
+%define with_vc4 1
+%endif
 %endif
 
 %if 0%{?with_vulkan_hw}
@@ -38,7 +43,7 @@
 Name:           mesa
 Summary:        Mesa graphics libraries
 Version:        23.1.4
-Release:        2%{?rctag:.%{rctag}}%{?dist}
+Release:        2%{?rctag:.%{rctag}}%{?dist}.alma.1
 
 License:        MIT
 URL:            http://www.mesa3d.org
@@ -349,7 +354,7 @@ export PYTHONPATH=/usr/lib/python3.6/site-packages/:%{buildroot}/usr/lib/python3
   -Ddri3=enabled \
   -Dosmesa=true \
 %if 0%{?with_hardware}
-  -Dgallium-drivers=swrast%{?with_crocus:,crocus}%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_kmsro:,kmsro} \
+  -Dgallium-drivers=swrast%{?with_crocus:,crocus}%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_v3d:,v3d}%{?with_vc4:,vc4}%{?with_kmsro:,kmsro} \
 %else
   -Dgallium-drivers=swrast,virgl \
 %endif
@@ -524,6 +529,9 @@ done
 %{_libdir}/dri/crocus_dri.so
 %{_libdir}/dri/iris_dri.so
 %endif
+%if 0%{?with_v3d}
+%{_libdir}/dri/v3d_dri.so
+%endif
 %if 0%{?with_vc4}
 %{_libdir}/dri/vc4_dri.so
 %endif
@@ -546,6 +554,33 @@ done
 %{_libdir}/dri/kms_swrast_dri.so
 %{_libdir}/dri/swrast_dri.so
 %{_libdir}/dri/virtio_gpu_dri.so
+%if 0%{?with_v3d} || 0%{?with_vc4} || 0%{?with_kmsro}
+%{_libdir}/dri/armada-drm_dri.so
+%{_libdir}/dri/exynos_dri.so
+%{_libdir}/dri/hx8357d_dri.so
+%{_libdir}/dri/ili9225_dri.so
+%{_libdir}/dri/ili9341_dri.so
+%{_libdir}/dri/imx-dcss_dri.so
+%{_libdir}/dri/imx-drm_dri.so
+%{_libdir}/dri/imx-lcdif_dri.so
+%{_libdir}/dri/ingenic-drm_dri.so
+%{_libdir}/dri/kirin_dri.so
+%{_libdir}/dri/komeda_dri.so
+%{_libdir}/dri/mali-dp_dri.so
+%{_libdir}/dri/mcde_dri.so
+%{_libdir}/dri/mediatek_dri.so
+%{_libdir}/dri/meson_dri.so
+%{_libdir}/dri/mi0283qt_dri.so
+%{_libdir}/dri/mxsfb-drm_dri.so
+%{_libdir}/dri/pl111_dri.so
+%{_libdir}/dri/rcar-du_dri.so
+%{_libdir}/dri/repaper_dri.so
+%{_libdir}/dri/rockchip_dri.so
+%{_libdir}/dri/st7586_dri.so
+%{_libdir}/dri/st7735r_dri.so
+%{_libdir}/dri/stm_dri.so
+%{_libdir}/dri/sun4i-drm_dri.so
+%endif
 
 %if %{with_hardware}
 %if 0%{?with_omx}
@@ -587,6 +622,10 @@ done
 %endif
 
 %changelog
+* Tue Jun 25 2024 Koichiro Iwao <meta@almalinux.org> - 23.1.4-2.alma.1
+- Enable v3d for Raspberry Pi graphic in AlmaLinux
+  Resolves: https://github.com/AlmaLinux/raspberry-pi/issues/32
+
 * Thu Nov 23 2023 José Expósito <jexposit@redhat.com> - 23.1.4-2
 - Rebuild against LLVM 17