commit 8c91312a8a02152cd2e7ccaabb34840c773b0678 Author: Thorsten Leemhuis <linux(a)leemhuis.info&gt; Date: Mon Dec 19 08:58:44 2022 +0100 Update to 22.3.1 sync a few bits with Fedora's mesa.spec Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info&gt; .gitignore | 1 + ...Guard-usage-of-infer_zink-explicit_zink-i.patch | 37 ------ ...ert-egl-glx-add-fallback-for-zink-loading.patch | 133 --------------------- gnome-shell-glthread-disable.patch | 11 ++ mesa-freeworld.spec | 27 +++-- sources | 2 +- 6 files changed, 33 insertions(+), 178 deletions(-) --- diff --git a/.gitignore b/.gitignore index 0784826..10e3d2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /mesa-22.2.2.tar.xz /mesa-22.2.3.tar.xz /mesa-22.3.0-rc2.tar.xz +/mesa-22.3.1.tar.xz diff --git a/gnome-shell-glthread-disable.patch b/gnome-shell-glthread-disable.patch new file mode 100644 index 0000000..b2caeb8 --- /dev/null +++ b/gnome-shell-glthread-disable.patch @@ -0,0 +1,11 @@ +diff -up mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf +--- mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma 2022-11-25 10:32:32.175879868 +1000 ++++ mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf 2022-11-25 10:32:43.743067470 +1000 +@@ -653,6 +653,7 @@ TODO: document the other workarounds. + <application name="gnome-shell" executable="gnome-shell"> + <option name="adaptive_sync" value="false" /> + <option name="v3d_nonmsaa_texture_size_limit" value="true" /> ++ <option name="mesa_glthread" value="false"/> + </application> + <application name="Desktop — Plasma" executable="plasmashell"> + <option name="adaptive_sync" value="false" /> diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec index 352ed7a..3ffd378 100644 --- a/mesa-freeworld.spec +++ b/mesa-freeworld.spec @@ -19,7 +19,7 @@ algorithms and decoding only VC1 algorithm. %global with_i915 0 %global with_iris 0 %global with_xa 0 -#%%global platform_vulkan ,intel +#%%global platform_vulkan ,intel,intel_hasvk %endif %ifarch aarch64 @@ -56,9 +56,9 @@ algorithms and decoding only VC1 algorithm. Name: %{srcname}-freeworld Summary: Mesa graphics libraries -%global ver 22.3.0-rc2 +%global ver 22.3.1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -70,11 +70,9 @@ Source1: Mesa-MLAA-License-Clarification-Email.txt Source2: org.mesa3d.vaapi.freeworld.metainfo.xml Source3: org.mesa3d.vdpau.freeworld.metainfo.xml -# revert zink autoloader it breaks glxinfo in a VM -Patch10: 0001-Revert-glx-Guard-usage-of-infer_zink-explicit_zink-i.patch -Patch11: 0002-Revert-egl-glx-add-fallback-for-zink-loading.patch +Patch10: gnome-shell-glthread-disable.patch -BuildRequires: meson >= 0.45 +BuildRequires: meson >= 0.61.4 BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gettext @@ -125,6 +123,14 @@ BuildRequires: pkgconfig(libomxil-bellagio) BuildRequires: pkgconfig(libelf) BuildRequires: pkgconfig(libglvnd) >= 1.3.2 BuildRequires: llvm-devel >= 7.0.0 +%if 0%{?with_opencl} +BuildRequires: clang-devel +BuildRequires: bindgen +BuildRequires: rust-packaging +BuildRequires: pkgconfig(libclc) +BuildRequires: pkgconfig(SPIRV-Tools) +BuildRequires: pkgconfig(LLVMSPIRVLib) +%endif %if %{with valgrind} BuildRequires: pkgconfig(valgrind) %endif @@ -187,6 +193,9 @@ cp %{SOURCE1} docs/ -Dgallium-xa=%{!?with_xa:enabled}%{?with_xa:disabled} \ -Dgallium-nine=%{!?with_nine:true}%{?with_nine:false} \ -Dgallium-opencl=%{!?with_opencl:icd}%{?with_opencl:disabled} \ +%if 0%{?with_opencl} + -Dgallium-rusticl=true -Dllvm=enabled -Drust_std=2021 \ +%endif -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec \ -Dvulkan-drivers=%{?vulkan_drivers} \ -Dvulkan-layers=device-select \ @@ -284,6 +293,10 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so %endif %changelog +* Mon Dec 19 2022 Thorsten Leemhuis <fedora(a)leemhuis.info&gt; - 22.3.1-1 +- Update to 22.3.1 +- sync a few bits with Fedora's mesa.spec + * Sun Nov 13 2022 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 22.3.0~rc2-2 - Updated to version 22.3.0-rc2. diff --git a/sources b/sources index c8c6b75..6aeb5cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-22.3.0-rc2.tar.xz) = dad41ba87b5f55c4e6f3478c348c14fc8b2b29beb87f20d99cedeeeb47bb787e2fe98570544cdb9bb06466fc3c61a43b9797d27e5f1b700c608ef539a5916fd4 +SHA512 (mesa-22.3.1.tar.xz) = 8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b