diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -1,7 +1,7 @@ # Created by: lesi@FreeBSD.org PORTNAME= libdrm -PORTVERSION= 2.4.110 +PORTVERSION= 2.4.111 PORTEPOCH= 1 CATEGORIES= graphics x11 MASTER_SITES= https://dri.freedesktop.org/libdrm/ diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1645773982 -SHA256 (libdrm-2.4.110.tar.xz) = eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737 -SIZE (libdrm-2.4.110.tar.xz) = 436372 +TIMESTAMP = 1654250031 +SHA256 (libdrm-2.4.111.tar.xz) = 1ad7164f77424de6f4ecba7c262bde196a214c6e19a6fbf497f0815f4d7ab2a9 +SIZE (libdrm-2.4.111.tar.xz) = 447388 SHA256 (7207431e466a.patch) = 97aa33faa22e4adc70d7154829aba1b4730ec01d3ebad1d2aea3d735fc181a9b SIZE (7207431e466a.patch) = 4791 diff --git a/graphics/libdrm/files/patch-libkms_vmwgfx.c b/graphics/libdrm/files/patch-libkms_vmwgfx.c deleted file mode 100644 --- a/graphics/libdrm/files/patch-libkms_vmwgfx.c +++ /dev/null @@ -1,27 +0,0 @@ -# the defintion of ERESTART is behind a check for _KERNEL, but -# defining that causes errno to not be defined. fortunately, there's -# an alternative switch. unfortunately, those differ by platform and -# _WANT_KERNEL_ERRNO is too recent to be part of any release, so just -# define ERESTART if we still don't have it after including errno.h -# ---- libkms/vmwgfx.c.orig 2018-05-09 22:26:03 UTC -+++ libkms/vmwgfx.c -@@ -26,10 +26,18 @@ - **************************************************************************/ - - -+#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) -+#define _WANT_KERNEL_ERRNO -+#elif defined(__DragonFly__) -+#define _KERNEL_STRUCTURES -+#endif - #include - #include - #include - #include "internal.h" -+#ifndef ERESTART -+#define ERESTART (-1) -+#endif - - #include "xf86drm.h" - #include "libdrm_macros.h" diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -38,7 +38,6 @@ include/libdrm/via_drm.h include/libdrm/virtgpu_drm.h %%VMWGFX_DRIVERS%%include/libdrm/vmwgfx_drm.h -include/libkms/libkms.h include/libsync.h include/xf86drm.h include/xf86drmMode.h @@ -54,14 +53,10 @@ %%RADEON_DRIVERS%%lib/libdrm_radeon.so %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.0.1 -lib/libkms.so -lib/libkms.so.1 -lib/libkms.so.1.0.0 libdata/pkgconfig/libdrm.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_amdgpu.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc -libdata/pkgconfig/libkms.pc %%MANPAGES%%man/man3/drmAvailable.3.gz %%MANPAGES%%man/man3/drmHandleEvent.3.gz %%MANPAGES%%man/man3/drmModeGetResources.3.gz