From dfdaaeb900f8a1a855650f41396f6004f0544c22 Mon Sep 17 00:00:00 2001 From: Asahi Lina Date: Nov 12 2024 10:52:00 +0000 Subject: Bundle libLLVMSPIRVLib with the mesa erofs Since we're packaging this downstream for F41, bundle it into the erofs overlay for now. This can be removed once we support LLVM19 properly. --- diff --git a/mesa.spec b/mesa.spec index 068e324..c7c636e 100644 --- a/mesa.spec +++ b/mesa.spec @@ -124,7 +124,7 @@ Name: mesa Summary: Mesa graphics libraries Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: %autorelease +Release: %autorelease -b 2 License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -444,6 +444,7 @@ Requires: fex-emu Supplements: fex-emu-rootfs-fedora Provides: fex-emu-overlay(%{_arch})(mesa) = %{version}-%{release} Provides: bundled(mesa) = %{version}-%{release} +License: MIT AND BSD-3-Clause AND SGI-B-2.0 AND NCSA %description fex-emu-overlay-%{_arch} Mesa EGL/GL libraries and Gallium/OpenCL/Vulkan drivers for FEX-emu roots file system images. @@ -604,6 +605,14 @@ install -Dpm0755 -s -t "fexov/%{_libdir}/" \ install -Dpm0755 -s -t "fexov/%{_libdir}/gbm/" \ %{buildroot}%{_libdir}/gbm/dri_gbm.so +%dnl deps ---------------------------- +# Ship this with the mesa erofs since it needs to work with the rawhide +# rootfs and spirv-llvm-translator is not packaged for compat. +# Make sure to remove the License: override for the subpackage +# if this gets removed. +install -Dpm0755 -s -t "fexov/%{_libdir}/" \ + %{_libdir}/libLLVMSPIRVLib.so.18.1 + # Hack to work around libcapsule bug: # https://github.com/ValveSoftware/steam-runtime/issues/704 #