.gitignore

@@ -1 +1 @@
-SOURCES/libdrm-2.4.123.tar.xz
+SOURCES/libdrm-2.4.115.tar.xz

.libdrm.metadata

@@ -1 +1 @@
-d61f31495f931d53971fa61686239483c25c2a86 SOURCES/libdrm-2.4.123.tar.xz
+0842e73f1710317adb7f42c4e313eb9e727d9f15 SOURCES/libdrm-2.4.115.tar.xz

SOURCES/README.rst

@@ -1,61 +0,0 @@
-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.

SPECS/libdrm.spec

@@ -22,18 +22,20 @@ end}
 %bcond_without amdgpu
 %bcond_without nouveau
 %bcond_without vmwgfx
-# Not (currently) used on non arm32
+%ifarch %{arm}
+%bcond_without omap
+%else
 %bcond_with    omap
-%bcond_with    exynos
+%endif
-%ifarch aarch64
+%ifarch %{arm} aarch64
+%bcond_without exynos
 %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
@@ -45,18 +47,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.123
+Version:        2.4.115
 Release:        2%{?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
@@ -93,6 +95,9 @@ 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.
@@ -140,32 +145,29 @@ 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.123.0
+%{_libdir}/libdrm.so.2.4.0
 %dir %{_datadir}/libdrm
 %if %{with intel}
 %{_libdir}/libdrm_intel.so.1
-%{_libdir}/libdrm_intel.so.1.123.0
+%{_libdir}/libdrm_intel.so.1.0.0
 %endif
 %if %{with radeon}
 %{_libdir}/libdrm_radeon.so.1
-%{_libdir}/libdrm_radeon.so.1.123.0
+%{_libdir}/libdrm_radeon.so.1.0.1
 %endif
 %if %{with amdgpu}
 %{_libdir}/libdrm_amdgpu.so.1
-%{_libdir}/libdrm_amdgpu.so.1.123.0
+%{_libdir}/libdrm_amdgpu.so.1.0.0
 %{_datadir}/libdrm/amdgpu.ids
 %endif
 %if %{with nouveau}
 %{_libdir}/libdrm_nouveau.so.2
-%{_libdir}/libdrm_nouveau.so.2.123.0
+%{_libdir}/libdrm_nouveau.so.2.0.0
 %endif
 %if %{with omap}
 %{_libdir}/libdrm_omap.so.1
@@ -177,15 +179,15 @@ cp %{SOURCE1} %{buildroot}%{_docdir}/libdrm
 %endif
 %if %{with freedreno}
 %{_libdir}/libdrm_freedreno.so.1
-%{_libdir}/libdrm_freedreno.so.1.123.0
+%{_libdir}/libdrm_freedreno.so.1.0.0
 %endif
 %if %{with tegra}
 %{_libdir}/libdrm_tegra.so.0
-%{_libdir}/libdrm_tegra.so.0.123.0
+%{_libdir}/libdrm_tegra.so.0.0.0
 %endif
 %if %{with etnaviv}
 %{_libdir}/libdrm_etnaviv.so.1
-%{_libdir}/libdrm_etnaviv.so.1.123.0
+%{_libdir}/libdrm_etnaviv.so.1.0.0
 %endif
 %if %{with udev}
 %{_udevrulesdir}/91-drm-modeset.rules
@@ -206,7 +208,7 @@ cp %{SOURCE1} %{buildroot}%{_docdir}/libdrm
 %{_libdir}/pkgconfig/libdrm_intel.pc
 %endif
 %if %{with radeon}
-%{_includedir}/libdrm/radeon_{bo,cs,surface}*.h
+%{_includedir}/libdrm/radeon_*.h
 %{_includedir}/libdrm/r600_pci_ids.h
 %{_libdir}/libdrm_radeon.so
 %{_libdir}/pkgconfig/libdrm_radeon.pc
@@ -262,104 +264,57 @@ cp %{SOURCE1} %{buildroot}%{_docdir}/libdrm
 
 %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
-* Wed Nov 13 2024 José Expósito <jexposit@redhat.com> - 2.4.123-2
+* Sat May 20 2023 Dave Airlie <airlied@redhat.com> - 2.4.115-2
-- Revert upstream commit ffaa3ce144be ("2.4.122, Build Intel on all arches")
+- Update to 2.4.115 (retry)
-  libpciaccess is not available in RHEL 9 aarch64, ppc64le and s390x
-  Resolves: https://issues.redhat.com/browse/RHEL-53869
 
-* Tue Nov 12 2024 José Expósito <jexposit@redhat.com> - 2.4.123-1
+* Thu May 18 2023 Dave Airlie <airlied@redhat.com> - 2.4.115-1
-- Update to 2.4.123
-  Resolves: https://issues.redhat.com/browse/RHEL-53869
-
-* Wed Jun 05 2024 José Expósito <jexposit@redhat.com> - 2.4.121-1
-- Update to 2.4.121
-
-* Mon May 27 2024 José Expósito <jexposit@redhat.com> - 2.4.120-1
-- Update to 2.4.120
-- Fix findings from static application security testing (SAST)
-
-* Mon Nov 06 2023 José Expósito <jexposit@redhat.com> - 2.4.117-1
-- Update to 2.4.117
-
-* Wed May 17 2023 Dave Airlie <airlied@redhat.com> - 2.4.115-1
 - Update to 2.4.115
 
-* Thu Nov 10 2022 Dave Airlie <airlied@redhat.com> - 2.4.111-1
+* Thu Nov 10 2022 Dave Airlie <airlied@redhat.com> - 2.4.114-1
 - Update to 2.4.114
 
-* Fri Jun 10 2022 Dave Airlie <airlied@redhat.com> - 2.4.111-1
+* Fri Jun 03 2022 Dave Airlie <airlied@redhat.com> - 2.4.111-1
 - Update to 2.4.111
 
-* Mon Nov 22 2021 Dave Airlie <airlied@redhat.com> - 2.4.108-1
+* Wed Nov 17 2021 Dave Airlie <airlied@redhat.com> - 2.4.108-1
 - Update to 2.4.108
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.107-3
+* Tue May 25 2021 Dave Airlie <airlied@redhat.com> - 2.4.106-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Fixup requires for devel packages
-  Related: rhbz#1991688
 
-* Thu Jul 08 2021 Dave Airlie <airlied@redhat.com> - 2.4.107-2
+* Tue May 18 2021 Dave Airlie <airlied@redhat.com> - 2.4.106-1
-- annobin rebuild
+- Update to 2.4.106
-
-* Wed Jul 07 2021 Dave Airlie <airlied@redhat.com> - 2.4.107-1
-- Update to 2.4.107
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.103-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.103-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
 * Wed Nov 04 2020 Dave Airlie <airlied@redhat.com> - 2.4.103-1
 - Update to 2.4.103
 
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.102-2
+* Tue May 26 2020 Dave Airlie <airlied@redhat.com> - 2.4.101-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed May 27 2020 Dave Airlie <airlied@redhat.com> - 2.4.102-1
-- Update to 2.4.102
-
-* Thu May 14 2020 Dave Airlie <airlied@redhat.com> - 2.4.101-1
 - Update to 2.4.101
 
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.100-2
+* Thu Nov 14 2019 Dave Airlie <airlied@redhat.com> - 2.4.100-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 17 2019 Pete Walter <pwalter@fedoraproject.org> - 2.4.100-1
 - Update to 2.4.100
 
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.99-2
+* Fri Aug 09 2019 Dave Airlie <airlied@redhat.com> - 2.4.98-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+- rebuild for annobin
 
-* Thu Jul 04 2019 Dave Airlie <airlied@redhat.com> - 2.4.99-1
+* Thu May 09 2019 Dave Airlie <airlied@redhat.com> - 2.4.98-1
-- Update to 2.4.99
-
-* Tue Apr 30 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2.4.98-1
 - Update to 2.4.98
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.97-2
+* Wed May 08 2019 Dave Airlie <airlied@redhat.com> - 2.4.97-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 29 2019 Dave Airlie <airlied@redhat.com> - 2.4.97-1
 - Update to 2.4.97
 
 * Mon Nov 19 2018 Adam Jackson <ajax@redhat.com> - 2.4.96-2