From e89544b7a4d811a64ca23b402add29524cc6f704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Fri, 28 Jun 2024 11:26:12 +0200 Subject: [PATCH] Fix s390x patch conditional --- mesa.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mesa.spec b/mesa.spec index 4284eb6..e030d81 100644 --- a/mesa.spec +++ b/mesa.spec @@ -76,12 +76,12 @@ Source0: https://archive.mesa3d.org/mesa-%{ver}.tar.xz # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source1: Mesa-MLAA-License-Clarification-Email.txt -Patch: gnome-shell-glthread-disable.patch -%ifarch s390x -Patch: fix-egl-on-s390x.patch -%endif -Patch: 0001-llvmpipe-Init-eglQueryDmaBufModifiersEXT-num_modifie.patch -Patch: 0001-Revert-ac-radeonsi-remove-has_syncobj-has_fence_to_h.patch +Patch10: gnome-shell-glthread-disable.patch +Patch11: 0001-llvmpipe-Init-eglQueryDmaBufModifiersEXT-num_modifie.patch +Patch12: 0001-Revert-ac-radeonsi-remove-has_syncobj-has_fence_to_h.patch + +# s390x only +Patch100: fix-egl-on-s390x.patch BuildRequires: meson >= 1.3.0 BuildRequires: gcc @@ -389,7 +389,11 @@ Obsoletes: mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release} The drivers with support for the Vulkan API. %prep -%autosetup -n %{name}-%{ver} -p1 +%autosetup -n %{name}-%{ver} -N +%autopatch -p1 -M 99 +%ifarch s390x +%autopatch -p1 -m 100 +%endif cp %{SOURCE1} docs/ %build