.gitignore

@@ -1 +1 @@
-SOURCES/libdrm-2.4.115.tar.xz
+SOURCES/libdrm-2.4.98.tar.bz2

.libdrm.metadata

@@ -1 +1 @@
-0842e73f1710317adb7f42c4e313eb9e727d9f15 SOURCES/libdrm-2.4.115.tar.xz
+4c8a11870a89f59c294bef0109939a7ffaa1fb26 SOURCES/libdrm-2.4.98.tar.bz2

SOURCES/libdrm-2.4.0-no-bc.patch

@@ -1,7 +1,7 @@
-diff -up libdrm-2.4.114/xf86drm.c.dma libdrm-2.4.114/xf86drm.c
---- libdrm-2.4.114/xf86drm.c.dma	2022-11-03 18:33:36.000000000 +1000
-+++ libdrm-2.4.114/xf86drm.c	2022-11-10 05:39:58.652477119 +1000
-@@ -930,11 +930,6 @@ drm_public int drmAvailable(void)
+diff -uNr libdrm-2.4.69.orig/xf86drm.c libdrm-2.4.69/xf86drm.c
+--- libdrm-2.4.69.orig/xf86drm.c	2016-07-20 20:42:39.000000000 +0200
++++ libdrm-2.4.69/xf86drm.c	2016-07-21 08:00:10.411599806 +0200
+@@ -484,11 +484,6 @@
      int           fd;
  
      if ((fd = drmOpenMinor(0, 1, DRM_NODE_PRIMARY)) < 0) {
@@ -13,7 +13,7 @@ diff -up libdrm-2.4.114/xf86drm.c.dma libdrm-2.4.114/xf86drm.c
          return 0;
      }
  
-@@ -1127,38 +1122,6 @@ static int drmOpenByName(const char *nam
+@@ -661,38 +656,6 @@
          }
      }
  
@@ -25,7 +25,7 @@ diff -up libdrm-2.4.114/xf86drm.c.dma libdrm-2.4.114/xf86drm.c
 -        int  retcode;
 -
 -        sprintf(proc_name, "/proc/dri/%d/name", i);
--        if ((fd = open(proc_name, O_RDONLY)) >= 0) {
+-        if ((fd = open(proc_name, 0, 0)) >= 0) {
 -            retcode = read(fd, buf, sizeof(buf)-1);
 -            close(fd);
 -            if (retcode) {

SPECS/libdrm.spec

@@ -1,11 +1,4 @@
 %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"
@@ -13,6 +6,7 @@ end}
   print(string.format("-D%s=%s", option, value))
 end}
 
+%bcond_without libkms
 %ifarch %{ix86} x86_64
 %bcond_without intel
 %else
@@ -53,12 +47,12 @@ end}
 
 Name:           libdrm
 Summary:        Direct Rendering Manager runtime library
-Version:        2.4.115
-Release:        2%{?dist}
+Version:        2.4.98
+Release:        1%{?dist}
 License:        MIT
 
 URL:            https://dri.freedesktop.org
-Source0:        %{url}/libdrm/%{name}-%{version}.tar.xz
+Source0:        %{url}/libdrm/%{name}-%{version}.tar.bz2
 Source2:        91-drm-modeset.rules
 
 BuildRequires:  meson >= 0.43
@@ -73,7 +67,9 @@ BuildRequires:  pkgconfig(pciaccess) >= 0.10
 BuildRequires:  pkgconfig(cairo)
 %endif
 %if %{with man_pages}
-BuildRequires:  python3-docutils
+BuildRequires:  %{_bindir}/xsltproc
+BuildRequires:  %{_bindir}/sed
+BuildRequires:  docbook-style-xsl
 %endif
 %if %{with valgrind}
 BuildRequires:  valgrind-devel
@@ -95,9 +91,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.
@@ -116,6 +109,7 @@ 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}                \
@@ -130,9 +124,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_tf freedreno_kgsl}        \
-  %{bcond_meson_tf install_test_programs} \
-  %{bcond_meson_tf udev}                  \
+  %{bcond_meson freedreno_kgsl}        \
+  %{bcond_meson install_test_programs} \
+  %{bcond_meson udev}                  \
   %{nil}
 %meson_build
 
@@ -152,6 +146,10 @@ install -Dpm0644 -t %{buildroot}%{_udevrulesdir} %{S:2}
 %{_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
 %if %{with intel}
 %{_libdir}/libdrm_intel.so.1
 %{_libdir}/libdrm_intel.so.1.0.0
@@ -202,6 +200,11 @@ install -Dpm0644 -t %{buildroot}%{_udevrulesdir} %{S:2}
 %{_includedir}/libdrm/*_drm.h
 %{_libdir}/libdrm.so
 %{_libdir}/pkgconfig/libdrm.pc
+%if %{with libkms}
+%{_includedir}/libkms/
+%{_libdir}/libkms.so
+%{_libdir}/pkgconfig/libkms.pc
+%endif
 %if %{with intel}
 %{_includedir}/libdrm/intel_*.h
 %{_libdir}/libdrm_intel.so
@@ -264,53 +267,21 @@ install -Dpm0644 -t %{buildroot}%{_udevrulesdir} %{S:2}
 
 %if %{with install_test_programs}
 %files -n drm-utils
-%{_bindir}/amdgpu_stress
 %{_bindir}/drmdevice
 %exclude %{_bindir}/etnaviv_*
 %exclude %{_bindir}/exynos_*
+%{_bindir}/kms-steal-crtc
+%{_bindir}/kms-universal-planes
+%if %{with libkms}
+%{_bindir}/kmstest
+%endif
 %{_bindir}/modeprint
 %{_bindir}/modetest
 %{_bindir}/proptest
 %{_bindir}/vbltest
-%if %{with tegra}
-%{_bindir}/tegra-*
-%endif
 %endif
 
 %changelog
-* Sat May 20 2023 Dave Airlie <airlied@redhat.com> - 2.4.115-2
-- Update to 2.4.115 (retry)
-
-* Thu May 18 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.114-1
-- Update to 2.4.114
-
-* Fri Jun 03 2022 Dave Airlie <airlied@redhat.com> - 2.4.111-1
-- Update to 2.4.111
-
-* Wed Nov 17 2021 Dave Airlie <airlied@redhat.com> - 2.4.108-1
-- Update to 2.4.108
-
-* Tue May 25 2021 Dave Airlie <airlied@redhat.com> - 2.4.106-2
-- Fixup requires for devel packages
-
-* Tue May 18 2021 Dave Airlie <airlied@redhat.com> - 2.4.106-1
-- Update to 2.4.106
-
-* Wed Nov 04 2020 Dave Airlie <airlied@redhat.com> - 2.4.103-1
-- Update to 2.4.103
-
-* Tue May 26 2020 Dave Airlie <airlied@redhat.com> - 2.4.101-1
-- Update to 2.4.101
-
-* Thu Nov 14 2019 Dave Airlie <airlied@redhat.com> - 2.4.100-1
-- Update to 2.4.100
-
-* Fri Aug 09 2019 Dave Airlie <airlied@redhat.com> - 2.4.98-2
-- rebuild for annobin
-
 * Thu May 09 2019 Dave Airlie <airlied@redhat.com> - 2.4.98-1
 - Update to 2.4.98