diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 2f5688d1e861..519b483e00eb 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -1,96 +1,96 @@ # 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/ PATCH_SITES= https://gitlab.freedesktop.org/mesa/${PORTNAME:S/lib//}/-/commit/ PATCHFILES+= 7207431e466a.patch:-p1 # https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/193 MAINTAINER= x11@FreeBSD.org COMMENT= Userspace interface to kernel Direct Rendering Module services LICENSE= MIT LIB_DEPENDS= libpciaccess.so:devel/libpciaccess USES= gnome meson pkgconfig tar:xz USE_LDCONFIG= yes OPTIONS_DEFINE= MANPAGES TESTS OPTIONS_SUB= yes TESTS_DESC= Install test programs (which are always built) .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= MANPAGES .endif MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_TRUE= man-pages TESTS_MESON_TRUE= install-test-programs # avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo) CONFIGURE_ARGS+= -Dcairo-tests=false # Disable some targets known to not work on FreeBSD MESON_ARGS+= -Domap=false \ -Dexynos=false \ -Dfreedreno=false \ -Dfreedreno-kgsl=false \ -Dvc4=false \ -Detnaviv=false \ -Dnouveau=false .include .if ${ARCH} == amd64 || ${ARCH} == i386 MESON_ARGS+= -Dvmwgfx=true \ -Dintel=true .else MESON_ARGS+= -Dvmwgfx=false \ -Dintel=false .endif .if ${ARCH} == amd64 || ${ARCH} == i386 PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="" PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="" .elif ${ARCH:Mpowerpc*} PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH} == aarch64 PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH:Marm*} PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH} == riscv64 PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .else PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="@comment " PLIST_SUB+= VMWGFX_DRIVERS="@comment " .endif .include diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo index 3dcbe14711ff..7b22ef87c6d3 100644 --- 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 index 17e68b6c6191..000000000000 --- 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 index a152ac735bda..8bd293ff9648 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -1,71 +1,66 @@ %%TESTS%%bin/drmdevice %%TESTS%%bin/kms-steal-crtc %%TESTS%%bin/kms-universal-planes %%TESTS%%bin/kmstest %%TESTS%%bin/modeprint %%TESTS%%bin/modetest %%TESTS%%bin/proptest %%TESTS%%bin/vbltest %%RADEON_DRIVERS%%include/libdrm/amdgpu.h %%RADEON_DRIVERS%%include/libdrm/amdgpu_drm.h include/libdrm/drm.h include/libdrm/drm_fourcc.h include/libdrm/drm_mode.h include/libdrm/drm_sarea.h include/libdrm/i915_drm.h %%INTEL_DRIVER%%include/libdrm/intel_aub.h %%INTEL_DRIVER%%include/libdrm/intel_bufmgr.h %%INTEL_DRIVER%%include/libdrm/intel_debug.h include/libdrm/mach64_drm.h include/libdrm/mga_drm.h include/libdrm/msm_drm.h include/libdrm/nouveau_drm.h include/libdrm/qxl_drm.h include/libdrm/r128_drm.h %%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h %%RADEON_DRIVERS%%include/libdrm/radeon_bo.h %%RADEON_DRIVERS%%include/libdrm/radeon_bo_gem.h %%RADEON_DRIVERS%%include/libdrm/radeon_bo_int.h %%RADEON_DRIVERS%%include/libdrm/radeon_cs.h %%RADEON_DRIVERS%%include/libdrm/radeon_cs_gem.h %%RADEON_DRIVERS%%include/libdrm/radeon_cs_int.h include/libdrm/radeon_drm.h %%RADEON_DRIVERS%%include/libdrm/radeon_surface.h include/libdrm/savage_drm.h include/libdrm/sis_drm.h include/libdrm/tegra_drm.h include/libdrm/vc4_drm.h 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 lib/libdrm.so lib/libdrm.so.2 lib/libdrm.so.2.4.0 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1.0.0 %%INTEL_DRIVER%%lib/libdrm_intel.so %%INTEL_DRIVER%%lib/libdrm_intel.so.1 %%INTEL_DRIVER%%lib/libdrm_intel.so.1.0.0 %%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 %%MANPAGES%%man/man7/drm-kms.7.gz %%MANPAGES%%man/man7/drm-memory.7.gz %%MANPAGES%%man/man7/drm.7.gz %%RADEON_DRIVERS%%%%DATADIR%%/amdgpu.ids