From 741415f721854c55c13725fafb77ed2c8b9f9ad4 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: May 01 2025 17:31:18 +0000 Subject: Provide wayland-protocols-1.41 for mesa's wrap project Should fix x86_64 build. --- diff --git a/mesa-asahi-flatpak.spec b/mesa-asahi-flatpak.spec index 2e7e83d..ec6e21c 100644 --- a/mesa-asahi-flatpak.spec +++ b/mesa-asahi-flatpak.spec @@ -10,11 +10,12 @@ %global spirv_headers_ver vulkan-sdk-1.4.304.1 %global spirv_llvm_translator_ver v18.1.2 %global pyyaml_ver 6.0.2 +%global wl_procols_ver 1.41 Name: mesa-asahi-%{sdk_ver}-flatpak Summary: Mesa graphics libraries Flatpak overlay Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1 +Release: 2 License: MIT URL: http://www.mesa3d.org @@ -27,6 +28,7 @@ Source12: https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags Source13: https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/%{spirv_tools_ver}.tar.gz Source14: https://github.com/llvm/llvm-project/archive/refs/tags/%{libclc_ver}.tar.gz Source15: https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17/pyyaml-%{pyyaml_ver}.tar.gz +Source17: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/%{wl_procols_ver}/downloads/wayland-protocols-%{wl_procols_ver}.tar.xz Requires: flatpak @@ -54,6 +56,7 @@ sed \ -e "s,\%SRC_SPIRV_TOOLS,%SOURCE13,g" \ -e "s,\%SRC_LIBCLC,%SOURCE14,g" \ -e "s,\%SRC_PYYAML,%SOURCE15,g" \ + -e "s,\%SRC_WL_PROTOCOLS,%SOURCE17,g" \ %SOURCE0 > org.freedesktop.Platform.GL.host.yml cp %SOURCE1 . diff --git a/org.freedesktop.Platform.GL.host.yml b/org.freedesktop.Platform.GL.host.yml index 199712e..5ff3539 100644 --- a/org.freedesktop.Platform.GL.host.yml +++ b/org.freedesktop.Platform.GL.host.yml @@ -198,6 +198,9 @@ modules: - type: patch path: mesa-asahi-version.patch - type: file + path: %SRC_WL_PROTOCOLS + dest: 'subprojects/packagecache' + - type: file path: /usr/bin/bindgen # We might need to make this do some arch-specific stuff later for i386 builds, but as of the time of writing we only do 64-bit builds so we'll be fine. diff --git a/sources b/sources index 03aeb82..5674231 100644 --- a/sources +++ b/sources @@ -4,3 +4,4 @@ SHA512 (pyyaml-6.0.2.tar.gz) = a675e0056bb6af9119c7f2796e349ced05afca64118a5b444 SHA512 (v18.1.2.tar.gz) = 889cdc0960f6029129dad62f7afe6f61b51bed9d8fb9fa6b743318e2243252dce62cbacf71a2b56decec24ce37746b4b4787dd426ad76e2feb74e1781cb070c8 SHA512 (v2024.4.rc2.tar.gz) = 0545754c800884ed0605401188b2a536f41b09db97dc2bdac5a1fa21444f1f13860c45760dc99364b336012b98f0cee2d083d46243739a6b9cdc1be824506eaa SHA512 (vulkan-sdk-1.4.304.1.tar.gz) = 5d9210e32e4bad681951646857afa59698455618c79713eb5a98f785317ca2965b9640f1fce3e1ca6650e847a4a74688d12ebc2b5943f336df0163feea67acc2 +SHA512 (wayland-protocols-1.41.tar.xz) = 6122fe4f20a1a0908abd631ff31302b56018050e5e835c1413d5b40a527980c30859ed9cddf595213f7d5eb1d50baaf6adc312cef9279d60b8a15e447e259863