rpms/Mesa
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatic version update by autodist [release 25.1.5-1mamba;Thu Jul 10 2025]

Browse Source
This commit is contained in:
Automatic Build System
2025-07-13 15:19:37 +02:00
parent ca7707f230
commit 56b49f3450
2 changed files with 63 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Mesa-25.1.1-Revert-kopper-Explicitly-choose-zink.patch Normal file
View File

@@ -0,0 +1,32 @@
From 24f85c06c28736b73c14208a0ffa6657d2aee9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@redhat.com>
Date: Mon, 21 Apr 2025 13:52:14 +0200
Subject: [PATCH] Revert "kopper: Explicitly choose zink"
On QEMU (virtio driver), without 3D acceleration enabled and without
mesa-vulkan-drivers installed, this commit prevents Mutter to start.
This reverts commit c0bc957c5d8c7edd57626284b712dd6ea1e375fc.
Related: https://bugzilla.redhat.com/show_bug.cgi?id=2360851
Related: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13009
---
src/gallium/frontends/dri/kopper.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c
index a1d7dcb79b4..3bdb56022a9 100644
--- a/src/gallium/frontends/dri/kopper.c
+++ b/src/gallium/frontends/dri/kopper.c
@@ -73,7 +73,7 @@ kopper_init_screen(struct dri_screen *screen, bool driver_name_is_inferred)
bool success;
#ifdef HAVE_LIBDRM
if (screen->fd != -1)
- success = pipe_loader_drm_probe_fd(&screen->dev, screen->fd, true);
+ success = pipe_loader_drm_probe_fd(&screen->dev, screen->fd, false);
else
success = pipe_loader_vk_probe_dri(&screen->dev);
#else
--
2.49.0

85
Mesa.spec
View File

@@ -1,6 +1,6 @@
Name: Mesa
Epoch: 1
Version: 25.0.6
Version: 25.1.5
Release: 1mamba
Summary: A 3-D graphics library with an API which is very similar to that of OpenGL
Group: System/Libraries
@@ -9,6 +9,7 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://mesa3d.org/
Source: https://archive.mesa3d.org/mesa-%{version}.tar.xz
Patch0: Mesa-25.1.1-Revert-kopper-Explicitly-choose-zink.patch
License: MIT
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@@ -21,6 +22,7 @@ BuildRequires: libelf-devel
BuildRequires: libexpat-devel
BuildRequires: libgcc
BuildRequires: libllvm-devel
BuildRequires: libpng-devel
BuildRequires: libsensors-devel
BuildRequires: libspirv-llvm-translator-devel
BuildRequires: libspirv-tools-devel
@@ -122,6 +124,7 @@ Common files and tools for the Mesa GL libraries.
%setup -q -n mesa-%{version}
#-D -T
#:<< _EOF
#% patch 0 -p1 -b .Revert-kopper-Explicitly-choose-zink
%build
#:<< _EOF
@@ -130,57 +133,44 @@ export CXX=clang++
export PYTHON=%{__python3}
%meson \
--wrap-mode=default \
-Db_lto=false \
-Db_ndebug=true \
-Dplatforms=x11,wayland \
%ifarch arm
-Dvulkan-drivers=amd,swrast,broadcom \
-Dgallium-drivers=r300,r600,radeonsi,freedreno,swrast,virgl,zink,etnaviv,kmsro,lima,panfrost,v3d,vc4 \
-Dlibunwind=disabled \
-Dvalgrind=disabled \
%endif
%ifarch aarch64
-Dvulkan-drivers=amd,swrast,broadcom \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,swrast,zink,etnaviv,lima,panfrost,v3d,vc4 \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,zink,etnaviv,lima,panfrost,v3d,vc4 \
-Dlibunwind=disabled \
-Dvalgrind=disabled \
%endif
%ifarch x86_64
-Dvulkan-drivers=amd,intel,intel_hasvk,swrast,virtio \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,i915,iris,crocus,zink,d3d12 \
-Dvulkan-drivers=amd,gfxstream,intel,intel_hasvk,nouveau,swrast,virtio,microsoft-experimental \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,llvmpipe,softpipe,iris,crocus,i915,zink,d3d12 \
-Dlibunwind=enabled \
-Dvalgrind=enabled \
%endif
%ifarch %{ix86}
-Dvulkan-drivers=amd,intel,intel_hasvk,swrast,virtio \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,i915,iris,crocus,zink \
-Dvulkan-drivers=amd,intel,intel_hasvk,nouveau,swrast,virtio \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,i915,iris,crocus,zink \
-Dlibunwind=enabled \
-Dvalgrind=enabled \
%endif
-Dvulkan-layers=device-select,intel-nullhw,overlay \
-Dvulkan-layers=device-select,intel-nullhw,overlay,screenshot,vram-report-limit \
-Degl=enabled \
-Dgallium-extra-hud=true \
-Dgallium-nine=true \
%ifnarch arm
-Dgallium-opencl=icd \
-Dgallium-rusticl=true \
%endif
-Dgallium-va=enabled \
-Dgallium-vdpau=enabled \
-Dgallium-xa=enabled \
-Drust_std=2021 \
-Dgbm=enabled \
-Dgles1=disabled \
-Dgles2=enabled \
-Dglvnd=enabled \
-Dglx=dri \
-Dlibunwind=enabled \
-Dllvm=enabled \
-Dlmsensors=enabled \
-Dosmesa=true \
-Dshared-glapi=enabled \
-Dmicrosoft-clc=disabled \
-Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \
-Dvideo-codecs=all \
-Ddri-drivers-path=%{_libdir}/dri
%meson_build
@@ -195,21 +185,23 @@ ln -s libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%files -n mesa-common
%defattr(-,root,root)
%ifnarch arm
%{_sysconfdir}/OpenCL/vendors/mesa.icd
#%{_sysconfdir}/OpenCL/vendors/mesa.icd
%{_sysconfdir}/OpenCL/vendors/rusticl.icd
%endif
%{_datadir}/drirc.d/*.conf
%{_datadir}/glvnd/egl_vendor.d/50_mesa.json
%ifnarch arm aarch64
%{_datadir}/vulkan/explicit_layer.d/VkLayer_INTEL_nullhw.json
%endif
%{_datadir}/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json
%{_datadir}/vulkan/explicit_layer.d/VkLayer_MESA_*.json
%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
%{_bindir}/mesa-overlay-control.py
%{_bindir}/mesa-screenshot-control.py
%ifarch x86_64
%{_bindir}/spirv2dxil
%endif
%doc licenses
%files -n libmesa
%defattr(-,root,root)
@@ -220,23 +212,20 @@ ln -s libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
%{_libdir}/libEGL_mesa.so.*
%{_libdir}/libGLX_mesa.so.*
%ifnarch arm
%{_libdir}/libMesaOpenCL.so.*
%{_libdir}/libRusticlOpenCL.so.*
%endif
%{_libdir}/libOSMesa.so.*
%ifnarch arm aarch64
%{_libdir}/libVkLayer_INTEL_nullhw.so
%endif
%{_libdir}/libVkLayer_MESA_device_select.so
%{_libdir}/libVkLayer_MESA_overlay.so
%{_libdir}/libxatracker.so.*
%{_libdir}/libVkLayer_MESA_*.so
%{_libdir}/libvulkan_*.so
%dir %{_libdir}/d3d
%{_libdir}/d3d/d3dadapter9.so.*
%dir %{_libdir}/dri
%ifarch x86_64
%{_libdir}/libspirv_to_dxil.so
%{_libdir}/dri/d3d12_dri.so
%{_libdir}/dri/d3d12_drv_video.so
%{_libdir}/dri/kms_swrast_dri.so
%{_libdir}/dri/swrast_dri.so
%endif
%ifarch %{ix86} x86_64
%{_libdir}/dri/crocus_dri.so
@@ -244,7 +233,6 @@ ln -s libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
%{_libdir}/dri/iris_dri.so
%{_libdir}/dri/vmwgfx_dri.so
%endif
%{_libdir}/dri/kms_swrast_dri.so
%{_libdir}/dri/libdril_dri.so
%{_libdir}/dri/nouveau_dri.so
%{_libdir}/dri/nouveau_drv_video.so
@@ -253,12 +241,12 @@ ln -s libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
%{_libdir}/dri/r600_drv_video.so
%{_libdir}/dri/radeonsi_dri.so
%{_libdir}/dri/radeonsi_drv_video.so
%{_libdir}/dri/swrast_dri.so
%{_libdir}/dri/virtio_gpu_dri.so
%{_libdir}/dri/virtio_gpu_drv_video.so
%{_libdir}/dri/zink_dri.so
%ifarch aarch64
%{_libdir}/dri/armada-drm_dri.so
%{_libdir}/dri/apple_dri.so
%{_libdir}/dri/etnaviv_dri.so
%{_libdir}/dri/exynos_dri.so
%{_libdir}/dri/gm12u320_dri.so
@@ -302,42 +290,31 @@ ln -s libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
%{_libdir}/dri/zynqmp-dpsub_dri.so
%endif
%{_libdir}/gbm/dri_gbm.so
%ifnarch arm
%dir %{_libdir}/gallium-pipe
%{_libdir}/gallium-pipe/pipe_*.so
%endif
%{_libdir}/vdpau/libvdpau_*.so.*
%{_datadir}/vulkan/icd.d/*.json
%files -n libmesa-devel
%defattr(-,root,root)
%{_includedir}/gbm.h
%{_includedir}/xa_*.h
%{_includedir}/GL/osmesa.h
%{_includedir}/gbm_backend_abi.h
%{_includedir}/EGL/*.h
%dir %{_includedir}/d3dadapter
%{_includedir}/d3dadapter/*.h
%dir %{_includedir}/GL/internal
%{_includedir}/GL/internal/dri_interface.h
%{_libdir}/libgbm.so
%{_libdir}/libxatracker.so
%{_libdir}/libGLX_mesa.so
%ifnarch arm
%{_libdir}/libMesaOpenCL.so
%{_libdir}/libRusticlOpenCL.so
%endif
%{_libdir}/libOSMesa.so
%{_libdir}/libEGL_mesa.so
#%{_libdir}/libglapi.so
%{_libdir}/d3d/d3dadapter9.so
%{_libdir}/vdpau/libvdpau_*.so
%{_libdir}/pkgconfig/d3d.pc
%ifarch x86_64
%{_libdir}/libspirv_to_dxil.a
%endif
%{_libdir}/pkgconfig/dri.pc
%{_libdir}/pkgconfig/gbm.pc
%{_libdir}/pkgconfig/osmesa.pc
%{_libdir}/pkgconfig/xatracker.pc
%changelog
* Thu Jul 10 2025 Automatic Build System <autodist@openmamba.org> 25.1.5-1mamba
- automatic version update by autodist
* Mon May 19 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 25.0.6-1mamba
- update to 25.0.6