Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libdrm for openSUSE:Factory checked in at 2022-11-23 09:47:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdrm (Old) and /work/SRC/openSUSE:Factory/.libdrm.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdrm" Wed Nov 23 09:47:36 2022 rev:163 rq:1037319 version:2.4.114 Changes: -------- --- /work/SRC/openSUSE:Factory/libdrm/libdrm.changes 2022-11-04 17:31:55.731849769 +0100 +++ /work/SRC/openSUSE:Factory/.libdrm.new.1597/libdrm.changes 2022-11-23 09:47:47.590943401 +0100 @@ -1,0 +2,31 @@ +Tue Nov 22 11:03:49 UTC 2022 - Stefan Dirsch <sndir...@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 <dims...@opensuse.org> + +- Only apply libdrm-drop-valgrind-dep.patch if valgrnid_support is + enabled (fix build on e.g. aarch64). + +------------------------------------------------------------------- +Tue Nov 22 10:18:27 UTC 2022 - Stefan Dirsch <sndir...@suse.com> + +- renamed libdrm-drop-valgrind-dep.patch to + n_libdrm-drop-valgrind-dep.patch in order to mark it as 'never + to be upstreamed' + +------------------------------------------------------------------- +Tue Nov 22 08:26:28 UTC 2022 - Dominique Leuenberger <dims...@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). + +------------------------------------------------------------------- New: ---- n_libdrm-drop-valgrind-dep-generic.patch n_libdrm-drop-valgrind-dep-intel.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdrm.spec ++++++ --- /var/tmp/diff_new_pack.cWLO8G/_old 2022-11-23 09:47:48.178946469 +0100 +++ /var/tmp/diff_new_pack.cWLO8G/_new 2022-11-23 09:47:48.182946490 +0100 @@ -34,6 +34,8 @@ # 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-generic.patch +Source4: n_libdrm-drop-valgrind-dep-intel.patch BuildRequires: fdupes BuildRequires: meson >= 0.43 BuildRequires: pkgconfig @@ -256,6 +258,19 @@ %install %meson_install +%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 +pushd %{buildroot}%{_libdir}/pkgconfig +echo "arch: %_arch" +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x +patch -p1 --no-backup-if-mismatch < %{SOURCE3} +%ifnarch s390x +patch -p1 --no-backup-if-mismatch < %{SOURCE4} +%endif +%endif +popd +%endif %fdupes %{buildroot}/%{_prefix} %post -n libdrm2 -p /sbin/ldconfig ++++++ n_libdrm-drop-valgrind-dep-generic.patch ++++++ 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 ++++++ 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
