diff --git a/mesa-24.2.1.tar.xz b/mesa-24.3.0.tar.xz similarity index 72% rename from mesa-24.2.1.tar.xz rename to mesa-24.3.0.tar.xz index 5c929a3b700a002fe9a27810c6ebec46cce4ae1c..752c52be3968dfc2ee2a99a6cf9679b0d9ab36d9 100644 Binary files a/mesa-24.2.1.tar.xz and b/mesa-24.3.0.tar.xz differ diff --git a/mesa.spec b/mesa.spec index b5f88772e71861c6616ca8fc660343982d5c9e96..a27db73576d6bdef864917c8eb2e7eb9dc153ad4 100644 --- a/mesa.spec +++ b/mesa.spec @@ -13,7 +13,6 @@ %define with_hardware 1 %define with_va 1 %define with_vdpau 1 -%define with_omx 1 %define with_nine 1 %endif @@ -51,20 +50,25 @@ %global dri_drivers %{?platform_drivers} %if 0%{?with_vulkan_hw} && (0%{?with_opencl} || 0%{?with_intel_clc}) -%define vulkan_drivers swrast,intel,amd,intel_hasvk +%define vulkan_drivers swrast,virtio,intel,amd,intel_hasvk %else -%define vulkan_drivers swrast,amd +%define vulkan_drivers swrast,virtio,amd %endif %global sanitize 0 +# We've gotten a report that enabling LTO for mesa breaks some games. See +# https://bugzilla.redhat.com/show_bug.cgi?id=1862771 for details. +# Disable LTO for now +%define _lto_cflags %{nil} + Name: mesa Summary: Mesa graphics libraries -Version: 24.2.1 -Release: 3 +Version: 24.3.0 +Release: 1 License: MIT -URL: http://www.mesa3d.org +URL: https://www.mesa3d.org Source0: https://archive.mesa3d.org/%{name}-%{version}.tar.xz # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31108/ @@ -82,7 +86,6 @@ BuildRequires: libdrm-devel >= 2.4.121 BuildRequires: libXxf86vm-devel BuildRequires: expat-devel BuildRequires: xorg-x11-proto-devel -BuildRequires: libselinux-devel BuildRequires: libXext-devel BuildRequires: libXfixes-devel BuildRequires: libXdamage-devel @@ -102,6 +105,7 @@ BuildRequires: spirv-tools-devel BuildRequires: spirv-llvm-translator-devel %endif BuildRequires: elfutils-libelf-devel +BuildRequires: /usr/bin/eu-findtextrel BuildRequires: libudev-devel BuildRequires: bison flex BuildRequires: pkgconfig(wayland-client) @@ -114,9 +118,6 @@ BuildRequires: libvdpau-devel BuildRequires: libva-devel %endif BuildRequires: pkgconfig(zlib) -%if 0%{?with_omx} -BuildRequires: libomxil-bellagio-devel -%endif BuildRequires: python3-mako %ifarch %{valgrind_arches} BuildRequires: pkgconfig(valgrind) @@ -136,6 +137,7 @@ BuildRequires: python3-pyyaml Summary: Mesa driver filesystem Provides: mesa-dri-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: mesa-dri-filesystem < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: mesa-omx-drivers < %{?epoch:%{epoch}:}%{version}-%{release} %description filesystem %{summary}. @@ -183,15 +185,6 @@ Requires: libdrm >= 2.4.103 %description dri-drivers %{summary}. -%if 0%{?with_omx} -%package omx-drivers -Summary: Mesa-based OMX drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description omx-drivers -%{summary}. -%endif - %if 0%{?with_va} %package va-drivers Summary: Mesa-based VA-API video acceleration drivers @@ -335,15 +328,13 @@ export ASFLAGS="--generate-missing-build-notes=yes" -Dlmsensors=disabled \ -Db_ndebug=true \ -Dplatforms=x11,wayland \ - -Ddri3=enabled \ -Dosmesa=true \ %if 0%{?with_hardware} - -Dgallium-drivers=swrast%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r300,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_crocus:,crocus}%{?with_vulkan_hw:,zink} \ + -Dgallium-drivers=softpipe,llvmpipe%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r300,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_crocus:,crocus}%{?with_vulkan_hw:,zink} \ %else - -Dgallium-drivers=swrast,virgl \ + -Dgallium-drivers=softpipe,llvmpipe,virgl \ %endif -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \ - -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \ -Dgallium-va=%{?with_va:enabled}%{!?with_va:disabled} \ -Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \ -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \ @@ -366,7 +357,6 @@ export ASFLAGS="--generate-missing-build-notes=yes" -Dshared-llvm=enabled \ -Dvalgrind=%{?with_valgrind:enabled}%{!?with_valgrind:disabled} \ -Dbuild-tests=false \ - -Dselinux=true \ %{nil} %meson_build @@ -375,6 +365,7 @@ export ASFLAGS="--generate-missing-build-notes=yes" %install %meson_install + # libvdpau opens the versioned name, don't bother including the unversioned rm -vf %{buildroot}%{_libdir}/vdpau/*.so # likewise glvnd @@ -394,9 +385,6 @@ rm -f %{buildroot}%{_includedir}/GL/w*.h rm -f %{buildroot}/%{_includedir}/vulkan/vk_platform.h rm -f %{buildroot}/%{_includedir}/vulkan/vulkan.h -# remove .la files -find %{buildroot} -name '*.la' -delete - # this keeps breaking, check it early. note that the exit from eu-ftr is odd. pushd %{buildroot}%{_libdir} for i in libOSMesa*.so libGL.so ; do @@ -443,6 +431,8 @@ done %files libgbm %{_libdir}/libgbm.so.1 %{_libdir}/libgbm.so.1.* +%{_libdir}/gbm/dri_gbm.so + %files libgbm-devel %{_libdir}/libgbm.so %{_includedir}/gbm.h @@ -567,13 +557,8 @@ done %endif %if %{with_hardware} -%if 0%{?with_omx} -%files omx-drivers -%{_libdir}/bellagio/libomx_mesa.so -%endif %if 0%{?with_va} %files va-drivers -%{_libdir}/dri/libgallium_drv_video.so %{_libdir}/dri/nouveau_drv_video.so %{_libdir}/dri/r600_drv_video.so %{_libdir}/dri/radeonsi_drv_video.so @@ -581,7 +566,6 @@ done %endif %if 0%{?with_vdpau} %files vdpau-drivers -%{_libdir}/vdpau/libvdpau_gallium.so.1* %{_libdir}/vdpau/libvdpau_nouveau.so.1* %{_libdir}/vdpau/libvdpau_r600.so.1* %{_libdir}/vdpau/libvdpau_radeonsi.so.1* @@ -602,6 +586,8 @@ done %{_libdir}/libvulkan_radeon.so %{_libdir}/libvulkan_lvp.so %{_datadir}/vulkan/icd.d/lvp_icd.*.json +%{_libdir}/libvulkan_virtio.so +%{_datadir}/vulkan/icd.d/virtio_icd.*.json %{_libdir}/libVkLayer_MESA_device_select.so %{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json @@ -610,6 +596,11 @@ done %endif %changelog +* Sun Nov 24 2024 Funda Wang - 24.3.0-1 +- update to 24.3.0 +- disable LTO build +- omx support dropped upstream + * Tue Sep 24 2024 jchzhou - 24.2.1-3 - fix the `unpackaged file zink_dri.so issue` for riscv64 diff --git a/mesa.yaml b/mesa.yaml index a7188fd552908e8dc22d27fe2682fa1e36833d83..47ec7edd8b2e7c23b2737b83a07b0bfd2f8f7c88 100644 --- a/mesa.yaml +++ b/mesa.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://gitlab.freedesktop.org/mesa/mesa.git tag_prefix: ^mesa- -seperator: . +separator: .