Accepting request 1037235 from home:dimstar:Factory

- Add libdrm-drop-valgrind-dep.patch (as source): drop dependency
  on valgrind on generated pkgconfig files. The .pc files are
  auto-generated by meson and are 'technically' correct, but we do
  not want to inject valgrind here (we can get away with this hack
  as it's only relevant when using pkg-config --static, and we
  do not provide static libs anyway).

clearly not the cleanest of solutions (dropping valgrind support
might be cleaner - i.e. does it have a performance impact?)

anyway, this 'hack' allows SLE to have this libdrm, and not need to
pull valgrind into the base packages; consumers of libdrm are 'safe'
as we do not support static builds (which is where Requires.private
is being used)

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

libdrm-drop-valgrind-dep.patch

@@ -0,0 +1,24 @@
+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
++++ pkgconfig/libdrm_intel.pc
+@@ -6,6 +6,6 @@ Name: libdrm_intel
+ Description: Userspace interface to intel kernel DRM services
+ Version: 2.4.114
+ Requires: libdrm
+-Requires.private: pciaccess >=  0.10, valgrind
++Requires.private: pciaccess >=  0.10
+ Libs: -L${libdir} -ldrm_intel
+ Cflags: -I${includedir} -I${includedir}/libdrm

libdrm.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Nov 22 08:26:28 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add libdrm-drop-valgrind-dep.patch (as source): drop dependency
+  on valgrind on generated pkgconfig files. The .pc files are
+  auto-generated by meson and are 'technically' correct, but we do
+  not want to inject valgrind here (we can get away with this hack
+  as it's only relevant when using pkg-config --static, and we
+  do not provide static libs anyway).
+
 -------------------------------------------------------------------
 Thu Nov  3 15:11:15 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 

libdrm.spec

@@ -34,6 +34,7 @@ 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:        libdrm-drop-valgrind-dep.patch
 BuildRequires:  fdupes
 BuildRequires:  meson >= 0.43
 BuildRequires:  pkgconfig
@@ -256,6 +257,10 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 
 %install
 %meson_install
+# 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 < %{SOURCE3})
 %fdupes %{buildroot}/%{_prefix}
 
 %post   -n libdrm2 -p /sbin/ldconfig