diff --git a/libdrm-2.4.110.tar.xz b/libdrm-2.4.110.tar.xz deleted file mode 100644 index c33e6bfba7bee75a854c756e68ad8fcdbdfd0a92..0000000000000000000000000000000000000000 Binary files a/libdrm-2.4.110.tar.xz and /dev/null differ diff --git a/libdrm-2.4.114.tar.xz b/libdrm-2.4.114.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..a637b4483be1099d9244527a3c2540dd406bba60 Binary files /dev/null and b/libdrm-2.4.114.tar.xz differ diff --git a/libdrm.spec b/libdrm.spec index 4fbb7516e25d33cb0f6de4e3623e1f1520cfed33..445d7dcc13e892f1f8b7f26ac3a1aff4c5a519ad 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -1,5 +1,12 @@ -%define anolis_release 2 +%define anolis_release 1 %define bcond_meson() %{lua: do + local option = rpm.expand("%{1}") + local with = rpm.expand("%{?with_" .. option .. "}") + local value = (with ~= '') and "enabled" or "disabled" + option = option:gsub('_', '-') + print(string.format("-D%s=%s", option, value)) +end} +%define bcond_meson_tf() %{lua: do local option = rpm.expand("%{1}") local with = rpm.expand("%{?with_" .. option .. "}") local value = (with ~= '') and "true" or "false" @@ -7,18 +14,29 @@ print(string.format("-D%s=%s", option, value)) end} -%bcond_without libkms +%ifarch x86_64 %bcond_without intel +%else +%bcond_with intel +%endif %bcond_without radeon %bcond_without amdgpu %bcond_without nouveau %bcond_without vmwgfx -%bcond_without omap +%bcond_with omap +%ifarch aarch64 %bcond_without exynos %bcond_without freedreno %bcond_without tegra %bcond_without vc4 %bcond_without etnaviv +%else +%bcond_with exynos +%bcond_with freedreno +%bcond_with tegra +%bcond_with vc4 +%bcond_with etnaviv +%endif %bcond_with cairo_tests %bcond_without man_pages %ifarch %{valgrind_arches} @@ -32,12 +50,12 @@ end} Name: libdrm Summary: Direct Rendering Manager runtime library -Version: 2.4.110 +Version: 2.4.114 Release: %{anolis_release}%{?dist} License: MIT URL: https://dri.freedesktop.org -Source0: %{url}/libdrm/%{name}-%{version}.tar.xz +Source0: https://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.xz Source1: README.rst Source2: 91-drm-modeset.rules @@ -62,6 +80,7 @@ BuildRequires: valgrind-devel BuildRequires: pkgconfig(udev) %endif BuildRequires: chrpath +Conflicts: libdrm-devel < 2.4.114 %description @@ -97,7 +116,6 @@ Utility programs for the kernel DRM interface. Will void your warranty. %build %meson \ - %{bcond_meson libkms} \ %{bcond_meson intel} \ %{bcond_meson radeon} \ %{bcond_meson amdgpu} \ @@ -112,9 +130,9 @@ Utility programs for the kernel DRM interface. Will void your warranty. %{bcond_meson cairo_tests} \ %{bcond_meson man_pages} \ %{bcond_meson valgrind} \ - %{bcond_meson freedreno_kgsl} \ - %{bcond_meson install_test_programs} \ - %{bcond_meson udev} \ + %{bcond_meson_tf freedreno_kgsl} \ + %{bcond_meson_tf install_test_programs} \ + %{bcond_meson_tf udev} \ %{nil} %meson_build @@ -131,53 +149,57 @@ mkdir -p %{buildroot}%{_docdir}/libdrm %generate_compatibility_deps -%ldconfig_scriptlets - %files %dir %{abidir} +%dir %{_datadir}/libdrm %{_libdir}/libdrm.so.2 %{_libdir}/libdrm.so.2.4.0 -%dir %{_datadir}/libdrm -%if %{with libkms} -%{_libdir}/libkms.so.1 -%{_libdir}/libkms.so.1.0.0 -%endif +%{abidir}/libdrm.dump %if %{with intel} %{_libdir}/libdrm_intel.so.1 %{_libdir}/libdrm_intel.so.1.0.0 +%{abidir}/libdrm_intel.dump %endif %if %{with radeon} %{_libdir}/libdrm_radeon.so.1 %{_libdir}/libdrm_radeon.so.1.0.1 +%{abidir}/libdrm_radeon.dump %endif %if %{with amdgpu} %{_libdir}/libdrm_amdgpu.so.1 %{_libdir}/libdrm_amdgpu.so.1.0.0 +%{abidir}/libdrm_amdgpu.dump %{_datadir}/libdrm/amdgpu.ids %endif %if %{with nouveau} %{_libdir}/libdrm_nouveau.so.2 %{_libdir}/libdrm_nouveau.so.2.0.0 +%{abidir}/libdrm_nouveau.dump %endif %if %{with omap} %{_libdir}/libdrm_omap.so.1 %{_libdir}/libdrm_omap.so.1.0.0 +%{abidir}/libdrm_omap.dump %endif %if %{with exynos} %{_libdir}/libdrm_exynos.so.1 %{_libdir}/libdrm_exynos.so.1.0.0 +%{abidir}/libdrm_exynos.dump %endif %if %{with freedreno} %{_libdir}/libdrm_freedreno.so.1 %{_libdir}/libdrm_freedreno.so.1.0.0 +%{abidir}/libdrm_freedreno.dump %endif %if %{with tegra} %{_libdir}/libdrm_tegra.so.0 %{_libdir}/libdrm_tegra.so.0.0.0 +%{abidir}/libdrm_tegra.dump %endif %if %{with etnaviv} %{_libdir}/libdrm_etnaviv.so.1 %{_libdir}/libdrm_etnaviv.so.1.0.0 +%{abidir}/libdrm_etnaviv.dump %endif %if %{with udev} %{_udevrulesdir}/91-drm-modeset.rules @@ -195,63 +217,48 @@ mkdir -p %{buildroot}%{_docdir}/libdrm %{_includedir}/libdrm/*_drm.h %exclude %{_includedir}/libdrm/vc4_drm.h %{_libdir}/libdrm.so -%{abidir}/libdrm.dump %{_libdir}/pkgconfig/libdrm.pc -%if %{with libkms} -%{_includedir}/libkms/ -%{_libdir}/libkms.so -%{abidir}/libkms.dump -%{_libdir}/pkgconfig/libkms.pc -%endif %if %{with intel} %{_includedir}/libdrm/intel_*.h %{_libdir}/libdrm_intel.so -%{abidir}/libdrm_intel.dump %{_libdir}/pkgconfig/libdrm_intel.pc %endif %if %{with radeon} %{_includedir}/libdrm/radeon_{bo,cs,surface}*.h %{_includedir}/libdrm/r600_pci_ids.h %{_libdir}/libdrm_radeon.so -%{abidir}/libdrm_radeon.dump %{_libdir}/pkgconfig/libdrm_radeon.pc %endif %if %{with amdgpu} %{_includedir}/libdrm/amdgpu.h %{_libdir}/libdrm_amdgpu.so -%{abidir}/libdrm_amdgpu.dump %{_libdir}/pkgconfig/libdrm_amdgpu.pc %endif %if %{with nouveau} %{_includedir}/libdrm/nouveau/ %{_libdir}/libdrm_nouveau.so -%{abidir}/libdrm_nouveau.dump %{_libdir}/pkgconfig/libdrm_nouveau.pc %endif %if %{with omap} %{_includedir}/libdrm/omap_*.h %{_includedir}/omap/ %{_libdir}/libdrm_omap.so -%{abidir}/libdrm_omap.dump %{_libdir}/pkgconfig/libdrm_omap.pc %endif %if %{with exynos} %{_includedir}/libdrm/exynos_*.h %{_includedir}/exynos/ %{_libdir}/libdrm_exynos.so -%{abidir}/libdrm_exynos.dump %{_libdir}/pkgconfig/libdrm_exynos.pc %endif %if %{with freedreno} %{_includedir}/freedreno/ %{_libdir}/libdrm_freedreno.so -%{abidir}/libdrm_freedreno.dump %{_libdir}/pkgconfig/libdrm_freedreno.pc %endif %if %{with tegra} %{_includedir}/libdrm/tegra.h %{_libdir}/libdrm_tegra.so -%{abidir}/libdrm_tegra.dump %{_libdir}/pkgconfig/libdrm_tegra.pc %endif %if %{with vc4} @@ -261,7 +268,6 @@ mkdir -p %{buildroot}%{_docdir}/libdrm %if %{with etnaviv} %{_includedir}/libdrm/etnaviv_*.h %{_libdir}/libdrm_etnaviv.so -%{abidir}/libdrm_etnaviv.dump %{_libdir}/pkgconfig/libdrm_etnaviv.pc %endif %{_includedir}/libsync.h @@ -286,11 +292,8 @@ mkdir -p %{buildroot}%{_docdir}/libdrm %exclude %{_bindir}/exynos_* %exclude %{abidir}/exynos_*-option.list %endif -%{_bindir}/kms-steal-crtc -%{_bindir}/kms-universal-planes -%if %{with libkms} -%{_bindir}/kmstest -%{abidir}/kmstest-option.list +%if %{with tegra} +%exclude %{_bindir}/tegra-* %endif %{_bindir}/modeprint %{_bindir}/modetest @@ -301,6 +304,10 @@ mkdir -p %{buildroot}%{_docdir}/libdrm %endif %changelog +* Sat Nov 26 2022 Funda Wang - 2.4.114-1 +- New version 2.4.114 +- Sync with Fedora's bcond + * Tue Oct 25 2022 mgb01105731 - 2.4.110-2 - optimise spec file & add doc package