Enable v3d, vc4 for Raspberry Pi graphics #2

Merged
alukoshko merged 1 commits from metalefty/mesa:a8-work into a8 2024-07-11 08:16:53 +00:00

View File

@ -23,6 +23,11 @@
%ifarch %{arm} aarch64 %ifarch %{arm} aarch64
%define with_xa 1 %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 %endif
%if 0%{?with_vulkan_hw} %if 0%{?with_vulkan_hw}
@ -38,7 +43,7 @@
Name: mesa Name: mesa
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Version: 23.1.4 Version: 23.1.4
Release: 2%{?rctag:.%{rctag}}%{?dist} Release: 2%{?rctag:.%{rctag}}%{?dist}.alma.1
License: MIT License: MIT
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -349,7 +354,7 @@ export PYTHONPATH=/usr/lib/python3.6/site-packages/:%{buildroot}/usr/lib/python3
-Ddri3=enabled \ -Ddri3=enabled \
-Dosmesa=true \ -Dosmesa=true \
%if 0%{?with_hardware} %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 %else
-Dgallium-drivers=swrast,virgl \ -Dgallium-drivers=swrast,virgl \
%endif %endif
@ -524,6 +529,9 @@ done
%{_libdir}/dri/crocus_dri.so %{_libdir}/dri/crocus_dri.so
%{_libdir}/dri/iris_dri.so %{_libdir}/dri/iris_dri.so
%endif %endif
%if 0%{?with_v3d}
%{_libdir}/dri/v3d_dri.so
%endif
%if 0%{?with_vc4} %if 0%{?with_vc4}
%{_libdir}/dri/vc4_dri.so %{_libdir}/dri/vc4_dri.so
%endif %endif
@ -546,6 +554,33 @@ done
%{_libdir}/dri/kms_swrast_dri.so %{_libdir}/dri/kms_swrast_dri.so
%{_libdir}/dri/swrast_dri.so %{_libdir}/dri/swrast_dri.so
%{_libdir}/dri/virtio_gpu_dri.so %{_libdir}/dri/virtio_gpu_dri.so
%if 0%{?with_v3d} || 0%{?with_vc4} || 0%{?with_kmsro}
Review

There is a little difference from a9. Any of with_3d with_vc4 with_kmsro enabled, the following drivers will be built.

There is a little difference from a9. Any of `with_3d` `with_vc4` `with_kmsro` enabled, the following drivers will be built.
%{_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 %{with_hardware}
%if 0%{?with_omx} %if 0%{?with_omx}
@ -587,6 +622,10 @@ done
%endif %endif
%changelog %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 * Thu Nov 23 2023 José Expósito <jexposit@redhat.com> - 23.1.4-2
- Rebuild against LLVM 17 - Rebuild against LLVM 17