diff --git a/libdrm-2.4.112.tar.xz b/libdrm-2.4.112.tar.xz deleted file mode 100644 index cbe9790..0000000 --- a/libdrm-2.4.112.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00b07710bd09b35cd8d80eaf4f4497fe27f4becf467a9830f1f5e8324f8420ff -size 451872 diff --git a/libdrm-2.4.113.tar.xz b/libdrm-2.4.113.tar.xz new file mode 100644 index 0000000..bf0dd7b --- /dev/null +++ b/libdrm-2.4.113.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fd7eb2967f63beb4606f22d50e277d993480d05ef75dd88a9bd8e677323e5e1 +size 457064 diff --git a/libdrm.changes b/libdrm.changes index e79168a..0362886 100644 --- a/libdrm.changes +++ b/libdrm.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Sep 13 10:34:04 UTC 2022 - Stefan Dirsch + +- disabled intel driver on s390x + +------------------------------------------------------------------- +Mon Sep 12 19:11:13 UTC 2022 - Dirk Müller + +- update to 2.4.113: + * amdgpu: update marketing names + * sync i915_pciids with kernel + * atomic: fix atomic_add_unless() fallback's return value + * intel: Avoid aliasing violation + * intel: Hook up new platforms IDs + * meson: auto-enable etnaviv on arm, arc, mips and loongarch architectures + * modetest: use drmGetFormatName() + * lots of testsuite and CI improvements +- enable intel support everywhere as there are now discrete intel GPUs +- enable vc4 support on armv7/aarch64 +- simplify valgrind support ifdefery + ------------------------------------------------------------------- Fri Jul 22 21:42:48 UTC 2022 - Dirk Müller diff --git a/libdrm.spec b/libdrm.spec index cb11746..a846648 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -16,8 +16,14 @@ # +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} +%bcond_without valgrind_support +%else +%bcond_with valgrind_support +%endif + Name: libdrm -Version: 2.4.112 +Version: 2.4.113 Release: 0 Summary: Userspace Interface for Kernel DRM Services License: MIT @@ -36,16 +42,9 @@ BuildRequires: python3-docutils BuildRequires: pkgconfig(pciaccess) >= 0.10 Provides: libdrm23 = %{version} Obsoletes: libdrm23 < %{version} -%if 0%{?with_valgrind_support:1} -%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} +%if %{with valgrind_support} BuildRequires: pkgconfig(valgrind) %endif -%endif -# bug437293 -%ifarch ppc64 -Obsoletes: libdrm-64bit < %{version} -Provides: libdrm-64bit = %{version} -%endif %description The package contains the userspace interface to the kernel DRM @@ -83,7 +82,7 @@ Requires: libdrm_tegra0 = %{version} %ifarch %{arm} Requires: libdrm_omap1 = %{version} %endif -%ifarch %{ix86} x86_64 +%ifnarch s390x Requires: libdrm_intel1 = %{version} %endif # bug437293 @@ -223,21 +222,28 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" --default-library=shared \ -Dinstall-test-programs=true \ -Dudev=true \ + -Dcairo-tests=disabled \ %ifarch %{arm} - -Domap=true \ + -Domap=enabled \ %endif %ifarch %{arm} aarch64 - -Detnaviv=true \ - -Dexynos=true \ - -Dfreedreno=true \ - -Dtegra=true \ -%endif -%ifnarch %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} - -Dvalgrind=false \ + -Detnaviv=enabled \ + -Dexynos=enabled \ + -Dfreedreno=enabled \ + -Dvc4=enabled \ + -Dtegra=enabled \ %else -%if 0%{!?with_valgrind_support:1} - -Dvalgrind=false \ + -Detnaviv=disabled \ + -Dfreedreno=disabled \ + -Dvc4=disabled \ %endif +%ifarch s390x + -Dintel=disabled \ +%endif +%if %{with valgrind_support} + -Dvalgrind=enabled \ +%else + -Dvalgrind=disabled \ %endif %{nil} %meson_build @@ -254,8 +260,10 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %post -n libdrm2 -p /sbin/ldconfig %postun -n libdrm2 -p /sbin/ldconfig +%ifnarch s390x %post -n libdrm_intel1 -p /sbin/ldconfig %postun -n libdrm_intel1 -p /sbin/ldconfig +%endif %post -n libdrm_nouveau2 -p /sbin/ldconfig %postun -n libdrm_nouveau2 -p /sbin/ldconfig %post -n libdrm_radeon1 -p /sbin/ldconfig @@ -316,7 +324,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %{_libdir}/libdrm.so.2* %dir %{_datarootdir}/libdrm -%ifarch %{ix86} x86_64 +%ifnarch s390x %files -n libdrm_intel1 %{_libdir}/libdrm_intel.so.1* %endif