- split n_libdrm-drop-valgrind-dep.patch into

n_libdrm-drop-valgrind-dep-generic.patch and
  n_libdrm-drop-valgrind-dep-intel.patch to fix build on s390 and
  armv7l

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=324

libdrm.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov 22 11:03:49 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- split n_libdrm-drop-valgrind-dep.patch into
+  n_libdrm-drop-valgrind-dep-generic.patch and
+  n_libdrm-drop-valgrind-dep-intel.patch to fix build on s390 and
+  armv7l
+
 -------------------------------------------------------------------
 Tue Nov 22 10:39:52 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 

libdrm.spec

@@ -34,7 +34,8 @@ URL:            https://dri.freedesktop.org/
 # Source URL:   https://dri.freedesktop.org/libdrm/
 Source:         https://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.xz
 Source2:        baselibs.conf
-Source3:        n_libdrm-drop-valgrind-dep.patch
+Source3:        n_libdrm-drop-valgrind-dep-generic.patch
+Source4:        n_libdrm-drop-valgrind-dep-intel.patch
 BuildRequires:  fdupes
 BuildRequires:  meson >= 0.43
 BuildRequires:  pkgconfig
@@ -260,8 +261,14 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 %if %{with valgrind_support}
 # patch the generated pkgconfig files to not have a dependency on valgrind
 # intentionally using a patch file to catch if we need to adjust
-(cd %{buildroot}%{_libdir}/pkgconfig
-patch -p1 --no-backup-if-mismatch < %{SOURCE3})
+pushd %{buildroot}%{_libdir}/pkgconfig
+%ifnarch %{arm}
+patch -p1 --no-backup-if-mismatch < %{SOURCE3}
+%ifnarch s390x
+patch -p1 --no-backup-if-mismatch < %{SOURCE4}
+%endif
+%endif
+popd
 %endif
 %fdupes %{buildroot}/%{_prefix}
 

n_libdrm-drop-valgrind-dep-generic.patch

@@ -0,0 +1,12 @@
+Index: pkgconfig/libdrm.pc
+===================================================================
+--- pkgconfig.orig/libdrm.pc
++++ pkgconfig/libdrm.pc
+@@ -5,7 +5,6 @@ libdir=${prefix}/lib64
+ Name: libdrm
+ Description: Userspace interface to kernel DRM services
+ Version: 2.4.114
+-Requires.private: valgrind
+ Libs: -L${libdir} -ldrm
+ Libs.private: -lm
+ Cflags: -I${includedir} -I${includedir}/libdrm

n_libdrm-drop-valgrind-dep-intel.patch

@@ -1,15 +1,3 @@
-Index: pkgconfig/libdrm.pc
-===================================================================
---- pkgconfig.orig/libdrm.pc
-+++ pkgconfig/libdrm.pc
-@@ -5,7 +5,6 @@ libdir=${prefix}/lib64
- Name: libdrm
- Description: Userspace interface to kernel DRM services
- Version: 2.4.114
--Requires.private: valgrind
- Libs: -L${libdir} -ldrm
- Libs.private: -lm
- Cflags: -I${includedir} -I${includedir}/libdrm
 Index: pkgconfig/libdrm_intel.pc
 ===================================================================
 --- pkgconfig.orig/libdrm_intel.pc