Index: head/graphics/libdrm/Makefile =================================================================== --- head/graphics/libdrm/Makefile (revision 434212) +++ head/graphics/libdrm/Makefile (revision 434213) @@ -1,88 +1,89 @@ # Created by: lesi@FreeBSD.org # $FreeBSD$ PORTNAME= libdrm PORTVERSION= 2.4.75 PORTEPOCH= 1 +PORTREVISION= 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 BUILD_DEPENDS= libdevq>=0.0.4:devel/libdevq LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \ libdevq.so:devel/libdevq \ 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="" .else CONFIGURE_ARGS+=--disable-libkms PLIST_SUB+= KMS="@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+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="" PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" .elif ${ARCH} == powerpc || ${ARCH} == powerpc64 PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" .elif ${ARCH} == armv6 || ${ARCH} == aarch64 PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="@comment " .else PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_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/files/patch-xf86drmMode.c =================================================================== --- head/graphics/libdrm/files/patch-xf86drmMode.c (revision 434212) +++ head/graphics/libdrm/files/patch-xf86drmMode.c (nonexistent) @@ -1,54 +0,0 @@ -Disable checking for hw.dri.%d.modesetting. -This sysctl is only available if a KMS module is loaded. But the libdrm -check happens before X got a chance of loading the KMS module. - ---- xf86drmMode.c.orig 2017-01-28 01:15:16 UTC -+++ xf86drmMode.c -@@ -47,6 +47,7 @@ - #include - #include - #ifdef HAVE_SYS_SYSCTL_H -+#include - #include - #endif - #include -@@ -797,38 +798,7 @@ int drmCheckModesettingSupported(const c - if (found) - return 0; - #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) -- char kbusid[1024], sbusid[1024]; -- char oid[128]; -- int domain, bus, dev, func; -- int i, modesetting, ret; -- size_t len; -- -- ret = sscanf(busid, "pci:%04x:%02x:%02x.%d", &domain, &bus, &dev, -- &func); -- if (ret != 4) -- return -EINVAL; -- snprintf(kbusid, sizeof(kbusid), "pci:%04x:%02x:%02x.%d", domain, bus, -- dev, func); -- -- /* How many GPUs do we expect in the machine ? */ -- for (i = 0; i < 16; i++) { -- snprintf(oid, sizeof(oid), "hw.dri.%d.busid", i); -- len = sizeof(sbusid); -- ret = sysctlbyname(oid, sbusid, &len, NULL, 0); -- if (ret == -1) { -- if (errno == ENOENT) -- continue; -- return -EINVAL; -- } -- if (strcmp(sbusid, kbusid) != 0) -- continue; -- snprintf(oid, sizeof(oid), "hw.dri.%d.modesetting", i); -- len = sizeof(modesetting); -- ret = sysctlbyname(oid, &modesetting, &len, NULL, 0); -- if (ret == -1 || len != sizeof(modesetting)) -- return -EINVAL; -- return (modesetting ? 0 : -ENOSYS); -- } -+ return 0; - #elif defined(__DragonFly__) - return 0; - #endif Property changes on: head/graphics/libdrm/files/patch-xf86drmMode.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