Index: head/graphics/libdrm/Makefile =================================================================== --- head/graphics/libdrm/Makefile (revision 431462) +++ head/graphics/libdrm/Makefile (revision 431463) @@ -1,73 +1,75 @@ # Created by: lesi@FreeBSD.org # $FreeBSD$ PORTNAME= libdrm -PORTVERSION= 2.4.66 +PORTVERSION= 2.4.74 PORTEPOCH= 1 CATEGORIES= graphics x11 MASTER_SITES= http://dri.freedesktop.org/libdrm/ MAINTAINER= x11@FreeBSD.org COMMENT= Userspace interface to kernel Direct Rendering Module services + +LICENSE= MIT LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \ libpthread-stubs.so:devel/libpthread-stubs USES= libtool pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip OPTIONS_DEFINE= MANPAGES .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= MANPAGES .endif USES+= gmake .include # KMS support in the kernel is only build on these archs, disable others .if ${ARCH} == "amd64" || ${ARCH} == "i386" CONFIGURE_ARGS+=--enable-libkms PLIST_SUB+= KMS="" NOUVEAU="" .else CONFIGURE_ARGS+=--disable-libkms PLIST_SUB+= KMS="@comment " NOUVEAU="@comment " .endif .if ${PORT_OPTIONS:MMANPAGES} BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl USE_GNOME+= libxslt:build PLIST_SUB+= MAN="" .else CONFIGURE_ARGS+=--disable-manpages PLIST_SUB+= MAN="@comment " .endif CONFIGURE_ARGS+=--disable-vmwgfx .if ${ARCH} == amd64 || ${ARCH} == i386 PLIST_SUB+= INTEL_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" .elif ${ARCH} == ia64 || ${ARCH} == powerpc || ${ARCH} == powerpc64 PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="" .else PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="@comment " .endif # This variable is not for users. So use a non-default name, intended for # people working on DRM kernel module development. .if !defined(LIBDRM_SKIP_RETURN_PATCH) EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drm.c .endif pre-patch: @${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \ s,i?86|x86_64),i?86|amd64|x86_64),g' \ ${WRKSRC}/configure .include Index: head/graphics/libdrm/distinfo =================================================================== --- head/graphics/libdrm/distinfo (revision 431462) +++ head/graphics/libdrm/distinfo (revision 431463) @@ -1,2 +1,3 @@ -SHA256 (libdrm-2.4.66.tar.bz2) = 79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76 -SIZE (libdrm-2.4.66.tar.bz2) = 694574 +TIMESTAMP = 1484389267 +SHA256 (libdrm-2.4.74.tar.bz2) = d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b +SIZE (libdrm-2.4.74.tar.bz2) = 781730 Index: head/graphics/libdrm/files/patch-tests_kms_kms-universal-planes.c =================================================================== --- head/graphics/libdrm/files/patch-tests_kms_kms-universal-planes.c (revision 431462) +++ head/graphics/libdrm/files/patch-tests_kms_kms-universal-planes.c (nonexistent) @@ -1,10 +0,0 @@ ---- tests/kms/kms-universal-planes.c.orig 2016-02-15 12:05:56.305353000 +0100 -+++ tests/kms/kms-universal-planes.c 2016-02-15 12:06:11.194126000 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include "xf86drm.h" Property changes on: head/graphics/libdrm/files/patch-tests_kms_kms-universal-planes.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/libdrm/files/extra-xf86drm.c =================================================================== --- head/graphics/libdrm/files/extra-xf86drm.c (revision 431462) +++ head/graphics/libdrm/files/extra-xf86drm.c (revision 431463) @@ -1,19 +1,19 @@ Error code 512 is being leaked from kernel space. While it should be converted to either EINTR or EAGAIN in the kernel. Teach libdrm to do this for now. Newer kernel modules will have this fixed included. dragonfly fixed this issue in, http://gitweb.dragonflybsd.org/dragonfly.git/commit/b922632f623ee2cc2c1346bb3a6894a7756676aa which will be included in the 4.4 release when it is released. ---- xf86drm.c.orig 2015-11-02 12:26:19.910518000 +0100 -+++ xf86drm.c 2015-11-02 12:27:10.575894000 +0100 -@@ -174,7 +174,7 @@ +--- xf86drm.c.orig 2016-11-29 11:15:10 UTC ++++ xf86drm.c +@@ -173,7 +173,7 @@ drmIoctl(int fd, unsigned long request, do { - ret = ioctl(fd, request, arg); + ret = ioctl(fd, request, arg); - } while (ret == -1 && (errno == EINTR || errno == EAGAIN)); + } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == 512)); return ret; } Index: head/graphics/libdrm/pkg-plist =================================================================== --- head/graphics/libdrm/pkg-plist (revision 431462) +++ head/graphics/libdrm/pkg-plist (revision 431463) @@ -1,72 +1,75 @@ %%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 %%NOUVEAU%%include/libdrm/nouveau/nouveau.h %%NOUVEAU%%include/libdrm/nouveau/nvif/cl0080.h %%NOUVEAU%%include/libdrm/nouveau/nvif/cl9097.h %%NOUVEAU%%include/libdrm/nouveau/nvif/class.h %%NOUVEAU%%include/libdrm/nouveau/nvif/if0002.h %%NOUVEAU%%include/libdrm/nouveau/nvif/if0003.h %%NOUVEAU%%include/libdrm/nouveau/nvif/ioctl.h %%NOUVEAU%%include/libdrm/nouveau/nvif/unpack.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/via_drm.h +include/libdrm/vc4_drm.h +include/libdrm/virtgpu_drm.h +include/libsync.h %%KMS%%include/libkms/libkms.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 %%NOUVEAU%%lib/libdrm_nouveau.so %%NOUVEAU%%lib/libdrm_nouveau.so.2 %%NOUVEAU%%lib/libdrm_nouveau.so.2.0.0 %%RADEON_DRIVERS%%lib/libdrm_radeon.so %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.0.1 %%KMS%%lib/libkms.so %%KMS%%lib/libkms.so.1 %%KMS%%lib/libkms.so.1.0.0 libdata/pkgconfig/libdrm.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_amdgpu.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc %%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc %%KMS%%libdata/pkgconfig/libkms.pc %%MAN%%man/man3/drmAvailable.3.gz %%MAN%%man/man3/drmHandleEvent.3.gz %%MAN%%man/man3/drmModeGetResources.3.gz %%MAN%%man/man7/drm-gem.7.gz %%MAN%%man/man7/drm-kms.7.gz %%MAN%%man/man7/drm-memory.7.gz %%MAN%%man/man7/drm-mm.7.gz %%MAN%%man/man7/drm-ttm.7.gz %%MAN%%man/man7/drm.7.gz