[packages/Mesa/Mesa-25.1] - fixed build without gbm: dri driver now requires gallium and gbm

[qboosh]

commit 6bc3c2df20ad0f2f3cde734155f095b95076074e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu May 28 20:37:06 2026 +0200

    - fixed build without gbm: dri driver now requires gallium and gbm

 Mesa.spec | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/Mesa.spec b/Mesa.spec
index 5f00df8..8b61826 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1300,7 +1300,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %meson_install
 
+%if %{with gbm}
 install -d $RPM_BUILD_ROOT%{_libdir}/gbm
+%endif
 
 %if %{without glvnd}
 # remove "OS ABI: Linux 2.4.20" tag, so private copies (nvidia or fglrx),
@@ -1514,30 +1516,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/d3d.pc
 %endif
 
+%if %{with gallium} && %{with gbm}
 %files dri-driver
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/libdril_dri.so
-%if %{with gallium_radeon}
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/r300_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/r600_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/radeonsi_dri.so
-%endif
 %ifarch %{ix86} %{x8664} x32
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/i915_dri.so
-%if %{with gallium}
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/crocus_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/i915_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/iris_dri.so
 %endif
-%endif
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/kms_swrast_dri.so
 %if %{with gallium_nouveau}
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
 %endif
+%if %{with gallium_radeon}
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/r300_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/r600_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/radeonsi_dri.so
+%endif
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/swrast_dri.so
 %if %{with gallium_zink}
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/zink_dri.so
 %endif
-%if %{with gallium}
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/kms_swrast_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/swrast_dri.so
 %ifarch %{arm} aarch64
 %ifarch aarch64
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/asahi_dri.so
@@ -1590,12 +1590,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/v3d_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/vc4_dri.so
-%endif
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/virtio_gpu_dri.so
 %ifarch %{ix86} %{x8664} x32
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/vmwgfx_dri.so
 %endif
 %endif
+%endif
 
 ### drivers: pipe
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Mesa.git/commitdiff/6bc3c2df20ad0f2f3cde734155f095b95076074e