From c3fe83e2266977c43a0bde2af1d3ab5e5d288bcf Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 15:02:02 +0000 Subject: [PATCH] import UBI libdrm-2.4.123-1.el10 --- .gitignore | 2 +- .libdrm.metadata | 1 - ...-drm-modeset.rules => 91-drm-modeset.rules | 0 README.rst | 61 +++++++ ....0-no-bc.patch => libdrm-2.4.0-no-bc.patch | 0 ....patch => libdrm-make-dri-perms-okay.patch | 0 SPECS/libdrm.spec => libdrm.spec | 156 ++++++++++++------ sources | 1 + 8 files changed, 171 insertions(+), 50 deletions(-) delete mode 100644 .libdrm.metadata rename SOURCES/91-drm-modeset.rules => 91-drm-modeset.rules (100%) create mode 100644 README.rst rename SOURCES/libdrm-2.4.0-no-bc.patch => libdrm-2.4.0-no-bc.patch (100%) rename SOURCES/libdrm-make-dri-perms-okay.patch => libdrm-make-dri-perms-okay.patch (100%) rename SPECS/libdrm.spec => libdrm.spec (81%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index c0473e0..31791af 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libdrm-2.4.115.tar.xz +libdrm-2.4.123.tar.xz diff --git a/.libdrm.metadata b/.libdrm.metadata deleted file mode 100644 index 886ff82..0000000 --- a/.libdrm.metadata +++ /dev/null @@ -1 +0,0 @@ -0842e73f1710317adb7f42c4e313eb9e727d9f15 SOURCES/libdrm-2.4.115.tar.xz diff --git a/SOURCES/91-drm-modeset.rules b/91-drm-modeset.rules similarity index 100% rename from SOURCES/91-drm-modeset.rules rename to 91-drm-modeset.rules diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..e47cb24 --- /dev/null +++ b/README.rst @@ -0,0 +1,61 @@ +libdrm - userspace library for drm +---------------------------------- + +This is libdrm, a userspace library for accessing the DRM, direct rendering +manager, on Linux, BSD and other operating systems that support the ioctl +interface. +The library provides wrapper functions for the ioctls to avoid exposing the +kernel interface directly, and for chipsets with drm memory manager, support +for tracking relocations and buffers. +New functionality in the kernel DRM drivers typically requires a new libdrm, +but a new libdrm will always work with an older kernel. + +libdrm is a low-level library, typically used by graphics drivers such as +the Mesa drivers, the X drivers, libva and similar projects. + + +Compiling +--------- + +libdrm has two build systems, a legacy autotools build system, and a newer +meson build system. The meson build system is much faster, and offers a +slightly different interface, but otherwise provides an equivalent feature set. + +To use it: + + meson builddir/ + +By default this will install into /usr/local, you can change your prefix +with --prefix=/usr (or `meson configure builddir/ -Dprefix=/usr` after +the initial meson setup). + +Then use ninja to build and install: + + ninja -C builddir/ install + +If you are installing into a system location you will need to run install +separately, and as root. + + +Alternatively you can invoke autotools configure: + + ./configure + +By default, libdrm will install into the /usr/local/ prefix. If you +want to install this DRM to replace your system copy, pass +--prefix=/usr and --exec-prefix=/ to configure. If you are building +libdrm from a git checkout, you first need to run the autogen.sh +script. You can pass any options to autogen.sh that you would other +wise pass to configure, or you can just re-run configure with the +options you need once autogen.sh finishes. + +Next step is to build libdrm: + + make + +and once make finishes successfully, install the package using + + make install + +If you are installing into a system location, you will need to be root +to perform the install step. diff --git a/SOURCES/libdrm-2.4.0-no-bc.patch b/libdrm-2.4.0-no-bc.patch similarity index 100% rename from SOURCES/libdrm-2.4.0-no-bc.patch rename to libdrm-2.4.0-no-bc.patch diff --git a/SOURCES/libdrm-make-dri-perms-okay.patch b/libdrm-make-dri-perms-okay.patch similarity index 100% rename from SOURCES/libdrm-make-dri-perms-okay.patch rename to libdrm-make-dri-perms-okay.patch diff --git a/SPECS/libdrm.spec b/libdrm.spec similarity index 81% rename from SPECS/libdrm.spec rename to libdrm.spec index 0154617..374c68d 100644 --- a/SPECS/libdrm.spec +++ b/libdrm.spec @@ -13,29 +13,23 @@ end} print(string.format("-D%s=%s", option, value)) end} -%ifarch %{ix86} x86_64 %bcond_without intel -%else -%bcond_with intel -%endif %bcond_without radeon %bcond_without amdgpu %bcond_without nouveau %bcond_without vmwgfx -%ifarch %{arm} -%bcond_without omap -%else +# Not (currently) used on non arm32 %bcond_with omap -%endif -%ifarch %{arm} aarch64 -%bcond_without exynos +%bcond_with exynos +%ifarch aarch64 %bcond_without freedreno +%bcond_without freedreno_kgsl %bcond_without tegra %bcond_without vc4 %bcond_without etnaviv %else -%bcond_with exynos %bcond_with freedreno +%bcond_with freedreno_kgsl %bcond_with tegra %bcond_with vc4 %bcond_with etnaviv @@ -47,18 +41,18 @@ end} %else %bcond_with valgrind %endif -%bcond_with freedreno_kgsl %bcond_without install_test_programs %bcond_without udev Name: libdrm Summary: Direct Rendering Manager runtime library -Version: 2.4.115 -Release: 2%{?dist} +Version: 2.4.123 +Release: 1%{?dist} License: MIT URL: https://dri.freedesktop.org Source0: %{url}/libdrm/%{name}-%{version}.tar.xz +Source1: README.rst Source2: 91-drm-modeset.rules BuildRequires: meson >= 0.43 @@ -95,9 +89,6 @@ Direct Rendering Manager runtime library Summary: Direct Rendering Manager development package Requires: %{name}%{?_isa} = %{version}-%{release} Requires: kernel-headers -%if %{with valgrind} -Requires: valgrind-devel -%endif %description devel Direct Rendering Manager development package. @@ -145,29 +136,32 @@ install -Dpm0755 -t %{buildroot}%{_bindir} %{_vpath_builddir}/tests/drmdevice %if %{with udev} install -Dpm0644 -t %{buildroot}%{_udevrulesdir} %{S:2} %endif +mkdir -p %{buildroot}%{_docdir}/libdrm +cp %{SOURCE1} %{buildroot}%{_docdir}/libdrm %ldconfig_scriptlets %files +%doc README.rst %{_libdir}/libdrm.so.2 -%{_libdir}/libdrm.so.2.4.0 +%{_libdir}/libdrm.so.2.123.0 %dir %{_datadir}/libdrm %if %{with intel} %{_libdir}/libdrm_intel.so.1 -%{_libdir}/libdrm_intel.so.1.0.0 +%{_libdir}/libdrm_intel.so.1.123.0 %endif %if %{with radeon} %{_libdir}/libdrm_radeon.so.1 -%{_libdir}/libdrm_radeon.so.1.0.1 +%{_libdir}/libdrm_radeon.so.1.123.0 %endif %if %{with amdgpu} %{_libdir}/libdrm_amdgpu.so.1 -%{_libdir}/libdrm_amdgpu.so.1.0.0 +%{_libdir}/libdrm_amdgpu.so.1.123.0 %{_datadir}/libdrm/amdgpu.ids %endif %if %{with nouveau} %{_libdir}/libdrm_nouveau.so.2 -%{_libdir}/libdrm_nouveau.so.2.0.0 +%{_libdir}/libdrm_nouveau.so.2.123.0 %endif %if %{with omap} %{_libdir}/libdrm_omap.so.1 @@ -179,15 +173,15 @@ install -Dpm0644 -t %{buildroot}%{_udevrulesdir} %{S:2} %endif %if %{with freedreno} %{_libdir}/libdrm_freedreno.so.1 -%{_libdir}/libdrm_freedreno.so.1.0.0 +%{_libdir}/libdrm_freedreno.so.1.123.0 %endif %if %{with tegra} %{_libdir}/libdrm_tegra.so.0 -%{_libdir}/libdrm_tegra.so.0.0.0 +%{_libdir}/libdrm_tegra.so.0.123.0 %endif %if %{with etnaviv} %{_libdir}/libdrm_etnaviv.so.1 -%{_libdir}/libdrm_etnaviv.so.1.0.0 +%{_libdir}/libdrm_etnaviv.so.1.123.0 %endif %if %{with udev} %{_udevrulesdir}/91-drm-modeset.rules @@ -208,7 +202,7 @@ install -Dpm0644 -t %{buildroot}%{_udevrulesdir} %{S:2} %{_libdir}/pkgconfig/libdrm_intel.pc %endif %if %{with radeon} -%{_includedir}/libdrm/radeon_*.h +%{_includedir}/libdrm/radeon_{bo,cs,surface}*.h %{_includedir}/libdrm/r600_pci_ids.h %{_libdir}/libdrm_radeon.so %{_libdir}/pkgconfig/libdrm_radeon.pc @@ -264,57 +258,123 @@ install -Dpm0644 -t %{buildroot}%{_udevrulesdir} %{S:2} %if %{with install_test_programs} %files -n drm-utils +%if %{with amdgpu} %{_bindir}/amdgpu_stress +%endif %{_bindir}/drmdevice +%if %{with etnaviv} %exclude %{_bindir}/etnaviv_* +%endif +%if %{with exynos} %exclude %{_bindir}/exynos_* +%endif +%if %{with tegra} +%exclude %{_bindir}/tegra-* +%endif %{_bindir}/modeprint %{_bindir}/modetest %{_bindir}/proptest %{_bindir}/vbltest -%if %{with tegra} -%{_bindir}/tegra-* -%endif %endif %changelog -* Sat May 20 2023 Dave Airlie - 2.4.115-2 -- Update to 2.4.115 (retry) +* Tue Nov 12 2024 José Expósito - 2.4.123-1 +- Update to 2.4.123 + Resolves: https://issues.redhat.com/browse/RHEL-53895 -* Thu May 18 2023 Dave Airlie - 2.4.115-1 -- Update to 2.4.115 +* Tue Oct 29 2024 Troy Dawson - 2.4.121-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 2.4.121-2 +- Bump release for June 2024 mass rebuild + +* Wed Jun 05 2024 José Expósito - 2.4.121-1 +- Update to 2.4.121 + +* Mon May 27 2024 José Expósito - 2.4.120-4 +- Fix findings from static application security testing (SAST) + +* Thu Jan 25 2024 Fedora Release Engineering - 2.4.120-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.4.120-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 14 2024 Peter Robinson - 2.4.120-1 +- Update to 2.4.120 +- Drop arm32 pieces + +* Tue Oct 24 2023 José Expósito - 2.4.117-1 +- Update to 2.4.117 + +* Thu Jul 20 2023 Fedora Release Engineering - 2.4.114-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 2.4.114-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Thu Nov 10 2022 Dave Airlie - 2.4.114-1 - Update to 2.4.114 -* Fri Jun 03 2022 Dave Airlie - 2.4.111-1 -- Update to 2.4.111 +* Sat Aug 06 2022 Frantisek Zatloukal - 2.4.112-1 +- Update to 2.4.112 -* Wed Nov 17 2021 Dave Airlie - 2.4.108-1 -- Update to 2.4.108 +* Thu Jul 21 2022 Fedora Release Engineering - 2.4.110-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Tue May 25 2021 Dave Airlie - 2.4.106-2 -- Fixup requires for devel packages +* Wed Feb 23 2022 Dave Airlie - 2.4.110-1 +- Update to 2.4.110 -* Tue May 18 2021 Dave Airlie - 2.4.106-1 -- Update to 2.4.106 +* Thu Jan 20 2022 Fedora Release Engineering - 2.4.109-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Nov 29 2021 Adam Jackson - 2.4.109-1 +- Update to 2.4.109 + +* Thu Jul 22 2021 Fedora Release Engineering - 2.4.107-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 06 2021 Dave Airlie - 2.4.107-1 +- Update to 2.4.107 + +* Fri Apr 16 2021 Pete Walter - 2.4.105-1 +- Update to 2.4.105 + +* Tue Jan 26 2021 Fedora Release Engineering - 2.4.103-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild * Wed Nov 04 2020 Dave Airlie - 2.4.103-1 - Update to 2.4.103 -* Tue May 26 2020 Dave Airlie - 2.4.101-1 +* Tue Jul 28 2020 Fedora Release Engineering - 2.4.102-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed May 27 2020 Dave Airlie - 2.4.102-1 +- Update to 2.4.102 + +* Thu May 14 2020 Dave Airlie - 2.4.101-1 - Update to 2.4.101 -* Thu Nov 14 2019 Dave Airlie - 2.4.100-1 +* Wed Jan 29 2020 Fedora Release Engineering - 2.4.100-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 17 2019 Pete Walter - 2.4.100-1 - Update to 2.4.100 -* Fri Aug 09 2019 Dave Airlie - 2.4.98-2 -- rebuild for annobin +* Thu Jul 25 2019 Fedora Release Engineering - 2.4.99-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Thu May 09 2019 Dave Airlie - 2.4.98-1 +* Thu Jul 04 2019 Dave Airlie - 2.4.99-1 +- Update to 2.4.99 + +* Tue Apr 30 2019 Peter Robinson 2.4.98-1 - Update to 2.4.98 -* Wed May 08 2019 Dave Airlie - 2.4.97-1 +* Fri Feb 01 2019 Fedora Release Engineering - 2.4.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 29 2019 Dave Airlie - 2.4.97-1 - Update to 2.4.97 * Mon Nov 19 2018 Adam Jackson - 2.4.96-2 @@ -579,7 +639,7 @@ install -Dpm0644 -t %{buildroot}%{_udevrulesdir} %{S:2} * Thu Jan 17 2013 Adam Jackson 2.4.41-1 - libdrm 2.4.41 plus git. Done as a git snapshot instead of the released - 2.4.41 since the release tarball is missing man/ entirely. + 2.4.41 since the release tarball is missing man/ entirely. - Pre-F16 changelog trim * Wed Jan 09 2013 Ben Skeggs 2.4.40-2 diff --git a/sources b/sources new file mode 100644 index 0000000..99648a5 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (libdrm-2.4.123.tar.xz) = d3e6ba26bbd609fd87ca131690547eeb6a903c0a8c28b7f5cd5d0947619da09f31daf7bf4b6c38bf5e5dc173e2ccba476338ef682d8cf06d6b71ba73fc9b948d