.gitignore

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

.libdrm.metadata

@@ -1 +1 @@
-0842e73f1710317adb7f42c4e313eb9e727d9f15 SOURCES/libdrm-2.4.115.tar.xz
+b28405363aa44e3801d90085b4dc6687a19a3eb4 SOURCES/libdrm-2.4.111.tar.xz

SOURCES/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.

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
+diff -up libdrm-2.4.103/xf86drm.c.dma libdrm-2.4.103/xf86drm.c
---- libdrm-2.4.114/xf86drm.c.dma	2022-11-03 18:33:36.000000000 +1000
+--- libdrm-2.4.103/xf86drm.c.dma	2020-11-04 13:24:14.000000000 +1000
-+++ libdrm-2.4.114/xf86drm.c	2022-11-10 05:39:58.652477119 +1000
++++ libdrm-2.4.103/xf86drm.c	2020-11-04 13:42:04.190975193 +1000
-@@ -930,11 +930,6 @@ drm_public int drmAvailable(void)
+@@ -507,11 +507,6 @@ drm_public int drmAvailable(void)
      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
+@@ -704,38 +699,6 @@ static int drmOpenByName(const char *nam
          }
      }
  
@@ -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, O_RDONLY, 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"
@@ -53,12 +46,13 @@ end}
 
 Name:           libdrm
 Summary:        Direct Rendering Manager runtime library
-Version:        2.4.115
+Version:        2.4.111
-Release:        2%{?dist}
+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.
@@ -130,9 +121,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 freedreno_kgsl}        \
-  %{bcond_meson_tf install_test_programs} \
+  %{bcond_meson install_test_programs} \
-  %{bcond_meson_tf udev}                  \
+  %{bcond_meson udev}                  \
   %{nil}
 %meson_build
 
@@ -145,10 +136,13 @@ 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
 %dir %{_datadir}/libdrm
@@ -278,43 +272,59 @@ install -Dpm0644 -t %{buildroot}%{_udevrulesdir} %{S:2}
 %endif
 
 %changelog
-* Sat May 20 2023 Dave Airlie <airlied@redhat.com> - 2.4.115-2
+* Fri Jun 10 2022 Dave Airlie <airlied@redhat.com> - 2.4.111-1
-- 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
+* Mon Nov 22 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
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.107-3
-- Fixup requires for devel packages
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Tue May 18 2021 Dave Airlie <airlied@redhat.com> - 2.4.106-1
+* Thu Jul 08 2021 Dave Airlie <airlied@redhat.com> - 2.4.107-2
-- Update to 2.4.106
+- annobin rebuild
+
+* 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 May 26 2020 Dave Airlie <airlied@redhat.com> - 2.4.101-1
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.102-2
+- 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
 
-* Thu Nov 14 2019 Dave Airlie <airlied@redhat.com> - 2.4.100-1
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.100-2
+- 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
 
-* Fri Aug 09 2019 Dave Airlie <airlied@redhat.com> - 2.4.98-2
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.99-2
-- rebuild for annobin
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
-* Thu May 09 2019 Dave Airlie <airlied@redhat.com> - 2.4.98-1
+* Thu Jul 04 2019 Dave Airlie <airlied@redhat.com> - 2.4.99-1
+- Update to 2.4.99
+
+* Tue Apr 30 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2.4.98-1
 - Update to 2.4.98
 
-* Wed May 08 2019 Dave Airlie <airlied@redhat.com> - 2.4.97-1
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.97-2
+- 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