!36 update to 2.4.115

From: @Jingwiw 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo

libdrm-2.4.0-no-bc.patch

@@ -1,7 +1,7 @@
-diff -Naur a/xf86drm.c b/xf86drm.c
+diff -up libdrm-2.4.114/xf86drm.c.dma libdrm-2.4.114/xf86drm.c
---- a/xf86drm.c	2021-01-14 16:31:10.113000000 +0800
+--- libdrm-2.4.114/xf86drm.c.dma	2022-11-03 18:33:36.000000000 +1000
-+++ b/xf86drm.c	2021-01-14 16:33:33.316000000 +0800
++++ libdrm-2.4.114/xf86drm.c	2022-11-10 05:39:58.652477119 +1000
-@@ -507,11 +507,6 @@
+@@ -930,11 +930,6 @@ drm_public int drmAvailable(void)
      int           fd;
  
      if ((fd = drmOpenMinor(0, 1, DRM_NODE_PRIMARY)) < 0) {
@@ -13,7 +13,7 @@ diff -Naur a/xf86drm.c b/xf86drm.c
          return 0;
      }
  
-@@ -704,38 +699,6 @@
+@@ -1127,38 +1122,6 @@ static int drmOpenByName(const char *nam
          }
      }
  
@@ -25,7 +25,7 @@ diff -Naur a/xf86drm.c b/xf86drm.c
 -        int  retcode;
 -
 -        sprintf(proc_name, "/proc/dri/%d/name", i);
--        if ((fd = open(proc_name, O_RDONLY, 0)) >= 0) {
+-        if ((fd = open(proc_name, O_RDONLY)) >= 0) {
 -            retcode = read(fd, buf, sizeof(buf)-1);
 -            close(fd);
 -            if (retcode) {
@@ -51,4 +51,3 @@ diff -Naur a/xf86drm.c b/xf86drm.c
 -
      return -1;
  }
- 

libdrm-2.4.109-sw.patch

@@ -1,7 +1,8 @@
-diff -Nuar libdrm-2.4.109.org/include/drm/drm_sarea.h libdrm-2.4.109.sw/include/drm/drm_sarea.h
+diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
---- libdrm-2.4.109.org/include/drm/drm_sarea.h	2022-02-26 01:16:04.810000000 +0000
+index 93025be..60b979a 100644
-+++ libdrm-2.4.109.sw/include/drm/drm_sarea.h	2022-02-26 04:13:03.090000000 +0000
+--- a/include/drm/drm_sarea.h
-@@ -39,7 +39,9 @@
++++ b/include/drm/drm_sarea.h
+@@ -39,7 +39,9 @@ extern "C" {
  #endif
  
  /* SAREA area needs to be at least a page */
@@ -12,10 +13,11 @@ diff -Nuar libdrm-2.4.109.org/include/drm/drm_sarea.h libdrm-2.4.109.sw/include/
  #define SAREA_MAX                       0x2000U
  #elif defined(__mips__)
  #define SAREA_MAX                       0x4000U
-diff -Nuar libdrm-2.4.109.org/xf86drm.c libdrm-2.4.109.sw/xf86drm.c
+diff --git a/xf86drm.c b/xf86drm.c
---- libdrm-2.4.109.org/xf86drm.c	2022-02-26 01:16:04.840000000 +0000
+index 7a7a23f..6daaaf7 100644
-+++ libdrm-2.4.109.sw/xf86drm.c	2022-02-26 02:33:50.700000000 +0000
+--- a/xf86drm.c
-@@ -1044,7 +1044,7 @@
++++ b/xf86drm.c
+@@ -1119,7 +1119,7 @@ static int drmOpenByBusid(const char *busid, int type)
              sv.drm_dd_major = -1;        /* Don't care */
              sv.drm_dd_minor = -1;        /* Don't care */
              if (drmSetInterfaceVersion(fd, &sv)) {
@@ -24,10 +26,11 @@ diff -Nuar libdrm-2.4.109.org/xf86drm.c libdrm-2.4.109.sw/xf86drm.c
                  pci_domain_ok = 0;
  #endif
                  sv.drm_di_major = 1;
-diff -Nuar libdrm-2.4.109.org/xf86drm.h libdrm-2.4.109.sw/xf86drm.h
+diff --git a/xf86drm.h b/xf86drm.h
---- libdrm-2.4.109.org/xf86drm.h	2022-02-26 01:16:04.840000000 +0000
+index 4c79a65..a8d3ad4 100644
-+++ libdrm-2.4.109.sw/xf86drm.h	2022-02-26 04:11:01.090000000 +0000
+--- a/xf86drm.h
-@@ -382,6 +382,34 @@
++++ b/xf86drm.h
+@@ -382,6 +382,34 @@ typedef struct _drmSetVersion {
  			  "r" (new));                                  \
  	} while (0)
  
@@ -62,7 +65,7 @@ diff -Nuar libdrm-2.4.109.org/xf86drm.h libdrm-2.4.109.sw/xf86drm.h
  #elif defined(__alpha__)
  
  #define	DRM_CAS(lock, old, new, ret)		\
-@@ -511,7 +539,9 @@
+@@ -511,7 +539,9 @@ do {	register unsigned int __old __asm("o0");		\
  #define DRM_CAS(lock,old,new,ret) do { ret=1; } while (0) /* FAST LOCK FAILS */
  #endif
  

libdrm-make-dri-perms-okay.patch

@@ -1,6 +1,7 @@
-diff -up libdrm-2.4.64/xf86drm.h.forceperms libdrm-2.4.64/xf86drm.h
+diff --git a/xf86drm.h b/xf86drm.h
---- libdrm-2.4.64/xf86drm.h.forceperms	2015-08-25 07:25:09.946427122 +1000
+index 4badaae..08cc287 100644
-+++ libdrm-2.4.64/xf86drm.h	2015-08-25 07:28:57.435553839 +1000
+--- a/xf86drm.h
++++ b/xf86drm.h
 @@ -74,7 +74,7 @@ extern "C" {
  /* Default /dev/dri directory permissions 0755 */
  #define DRM_DEV_DIRMODE	 	\

libdrm.spec

@@ -1,4 +1,11 @@
 %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"
@@ -6,7 +13,6 @@
   print(string.format("-D%s=%s", option, value))
 end}
 
-%bcond_without libkms
 %ifarch %{ix86} x86_64
 %bcond_without intel
 %else
@@ -26,6 +32,7 @@ end}
 %bcond_without freedreno
 %bcond_without tegra
 %bcond_without vc4
+
 %bcond_without etnaviv
 %else
 %bcond_with    exynos
@@ -46,8 +53,8 @@ end}
 %bcond_without udev
 
 Name:           libdrm
-Version:        2.4.109
+Version:        2.4.115
-Release:        7
+Release:        1
 License:        MIT
 Summary:        library for direct rendering manager
 
@@ -115,14 +122,14 @@ Utility programs for the kernel DRM interface.
 
 %build
 %meson \
-  %{bcond_meson libkms} %{bcond_meson intel} %{bcond_meson radeon} %{bcond_meson amdgpu}                \
+  %{bcond_meson intel} %{bcond_meson radeon} %{bcond_meson amdgpu}                                      \
   %{bcond_meson nouveau} %{bcond_meson vmwgfx} %{bcond_meson omap} %{bcond_meson exynos}                \
   %{bcond_meson freedreno} %{bcond_meson tegra} %{bcond_meson vc4} %{bcond_meson etnaviv}               \
   %{bcond_meson cairo_tests} %{bcond_meson man_pages} \
 %if %{?openEuler:1}0
   %{bcond_meson valgrind} \
 %endif
-  %{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
 
@@ -146,9 +153,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/drmdevice
 %defattr(-,root,root)
 %{_libdir}/%{name}.so.*
 %dir %{_datadir}/%{name}/
-%if %{with libkms}
-%{_libdir}/libkms.so.*
-%endif
 %if %{with intel}
 %{_libdir}/%{name}_intel.so.*
 %endif
@@ -187,11 +191,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/drmdevice
 %{_includedir}/%{name}/*_drm.h
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
-%if %{with libkms}
-%{_includedir}/libkms/
-%{_libdir}/libkms.so
-%{_libdir}/pkgconfig/libkms.pc
-%endif
 %if %{with intel}
 %{_includedir}/%{name}/intel_*.h
 %{_libdir}/%{name}_intel.so
@@ -251,12 +250,14 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/drmdevice
 %defattr(-,root,root)
 %{_bindir}/amdgpu_stress
 %{_bindir}/drmdevice
+%if %{with etnaviv}
 %exclude %{_bindir}/etnaviv_*
+%endif
+%if %{with exynos}
 %exclude %{_bindir}/exynos_*
-%{_bindir}/kms-steal-crtc
+%endif
-%{_bindir}/kms-universal-planes
+%if %{with tegra}
-%if %{with libkms}
+%exclude %{_bindir}/tegra-*
-%{_bindir}/kmstest
 %endif
 %{_bindir}/modeprint
 %{_bindir}/modetest
@@ -272,6 +273,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/drmdevice
 %endif
 
 %changelog
+* Tue Jul 11 2023 Jingwiw  <wangjingwei@iscas.ac.cn> - 2.4.115-1
+- update to 2.4.115
+
 * Thu Dec 08 2022 zhouwenpei<zhouwenpei1@h-partners.com> - 2.4.109-7
 - remove rpath