sysutils/libdrm: update to 2.4.114

4 files changed, 42 insertions, 10 deletions

diff --git a/sysutils/libdrm/Makefile b/sysutils/libdrm/Makefile
index 222330e..4322b29 100644
--- a/sysutils/libdrm/Makefile
+++ b/sysutils/libdrm/Makefile
@@ -2,11 +2,11 @@ ONLY_FOR_ARCHS =	amd64 i386 sparc64
 
 COMMENT =	Direct Rendering Manager library and headers
 
-DISTNAME =	libdrm-2.4.112
+DISTNAME =	libdrm-2.4.114
 EXTRACT_SUFX = 	.tar.xz
 
-SHARED_LIBS =	drm 7.11 drm_radeon 4.0 drm_intel 5.4 \
-                drm_amdgpu 1.12 drm_nouveau 3.0
+SHARED_LIBS =	drm 7.12 drm_radeon 4.0 drm_intel 5.4 \
+                drm_amdgpu 1.12
 
 CATEGORIES =	sysutils
 
@@ -19,13 +19,18 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		devel/meson xenocara
 
-WANTLIB	= 		m pciaccess
+WANTLIB	= 		pciaccess
 
 MASTER_SITES =		https://dri.freedesktop.org/libdrm/
 
+BUILD_DEPENDS =		textproc/py-docutils
+
 LIB_DEPENDS =		sysutils/libpciaccess
 
-CONFIGURE_ARGS =	-Dnouveau=false
+CONFIGURE_ARGS =	-Detnaviv=disabled \
+			-Dfreedreno=disabled \
+			-Dnouveau=disabled \
+			-Dvalgrind=disabled
 
 SEPARATE_BUILD =	Yes
 
diff --git a/sysutils/libdrm/distinfo b/sysutils/libdrm/distinfo
index 58c4829..0f6d8df 100644
--- a/sysutils/libdrm/distinfo
+++ b/sysutils/libdrm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdrm-2.4.112.tar.xz) = ALB3EL0Js1zY2A6vT0SX/if0vs9Gepgw8fXoMk+EIP8=
-SIZE (libdrm-2.4.112.tar.xz) = 451872
+SHA256 (libdrm-2.4.114.tar.xz) = MEnPhDpH0S5e7vvDvjSW14L6CfQjRr8Lfe/j0eWY0CY=
+SIZE (libdrm-2.4.114.tar.xz) = 471664
diff --git a/sysutils/libdrm/patches/patch-xf86drm_c b/sysutils/libdrm/patches/patch-xf86drm_c
index 248786e..e70ebc5 100644
--- a/sysutils/libdrm/patches/patch-xf86drm_c
+++ b/sysutils/libdrm/patches/patch-xf86drm_c
@@ -12,6 +12,15 @@ Index: xf86drm.c
  #if defined(__OpenBSD__) || defined(__DragonFly__)
  struct drm_pciinfo {
  	uint16_t	domain;
+@@ -732,7 +736,7 @@ static int drmMatchBusID(const char *id1, const char *
+  * If any other failure happened then it will output error message using
+  * drmMsg() call.
+  */
+-#if !UDEV
++#if !UDEV && !defined(__OpenBSD__)
+ static int chown_check_return(const char *path, uid_t owner, gid_t group)
+ {
+         int rv;
 @@ -763,6 +767,18 @@ static const char *drmGetDeviceName(int type)
      return NULL;
  }
@@ -31,6 +40,15 @@ Index: xf86drm.c
  /**
   * Open the DRM device, creating it if necessary.
   *
+@@ -784,7 +800,7 @@ static int drmOpenDevice(dev_t dev, int minor, int typ
+     int             fd;
+     mode_t          devmode = DRM_DEV_MODE, serv_mode;
+     gid_t           serv_group;
+-#if !UDEV
++#if !UDEV && !defined(__OpenBSD__)
+     int             isroot  = !geteuid();
+     uid_t           user    = DRM_DEV_UID;
+     gid_t           group   = DRM_DEV_GID;
 @@ -802,6 +818,7 @@ static int drmOpenDevice(dev_t dev, int minor, int typ
          devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
      }
@@ -46,7 +64,7 @@ Index: xf86drm.c
 +#endif /* __OpenBSD__ */
  
 +#ifndef X_PRIVSEP
-     fd = open(buf, O_RDWR | O_CLOEXEC, 0);
+     fd = open(buf, O_RDWR | O_CLOEXEC);
 +#else
 +    fd = priv_open_device(buf);
 +#endif
@@ -64,10 +82,10 @@ Index: xf86drm.c
          return -EINVAL;
  
      sprintf(buf, dev_name, DRM_DIR_NAME, minor);
--    if ((fd = open(buf, O_RDWR | O_CLOEXEC, 0)) >= 0)
+-    if ((fd = open(buf, O_RDWR | O_CLOEXEC)) >= 0)
 -        return fd;
 +#ifndef X_PRIVSEP
-+    fd = open(buf, O_RDWR | O_CLOEXEC, 0);
++    fd = open(buf, O_RDWR | O_CLOEXEC);
 +#else
 +    fd = priv_open_device(buf);
 +#endif
diff --git a/sysutils/libdrm/pkg/PLIST b/sysutils/libdrm/pkg/PLIST
index edf4bb9..78faebb 100644
--- a/sysutils/libdrm/pkg/PLIST
+++ b/sysutils/libdrm/pkg/PLIST
@@ -27,6 +27,8 @@ include/libdrm/savage_drm.h
 include/libdrm/sis_drm.h
 include/libdrm/tegra_drm.h
 include/libdrm/vc4_drm.h
+include/libdrm/vc4_packet.h
+include/libdrm/vc4_qpu_defines.h
 include/libdrm/via_drm.h
 include/libdrm/virtgpu_drm.h
 include/libdrm/vmwgfx_drm.h
@@ -41,4 +43,11 @@ lib/pkgconfig/libdrm.pc
 lib/pkgconfig/libdrm_amdgpu.pc
 lib/pkgconfig/libdrm_intel.pc
 lib/pkgconfig/libdrm_radeon.pc
+lib/pkgconfig/libdrm_vc4.pc
+@man man/man3/drmAvailable.3
+@man man/man3/drmHandleEvent.3
+@man man/man3/drmModeGetResources.3
+@man man/man7/drm-kms.7
+@man man/man7/drm-memory.7
+@man man/man7/drm.7
 share/libdrm/amdgpu.ids