diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index 9811c6e012f4..e4cea9dc4886 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -1,50 +1,50 @@ PORTNAME= xf86-video-intel DISTVERSION= 2.99.917-916 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org legacy driver for Intel integrated graphics chipsets WWW= https://01.org/linuxgraphics/ LICENSE= MIT # various LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= only Intel integrated GPUs on x86 are supported LIB_DEPENDS= libdrm_intel.so:graphics/libdrm USES= cpe localbase xorg xorg-cat:driver CPE_VENDOR= x USE_GITLAB= yes GL_COMMIT= 31486f40f8e8f8923ca0799aea84b58799754564 USE_XORG= pciaccess pixman CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no # XXX ports/242236 CONFIGURE_ARGS= --with-builderstring="${DISTVERSIONFULL}" TEST_TARGET= check # XXX bug 214593: SNA crashes on pre-SandyBridge hardware CONFIGURE_ARGS+=--with-default-accel=uxa OPTIONS_DEFINE= UDEV XVMC OPTIONS_DEFAULT=UDEV XVMC OPTIONS_SUB= yes UDEV_DESC= udev-based monitor hotplug detection UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd UDEV_CONFIGURE_ENABLE= udev XVMC_LIB_DEPENDS= libxcb-util.so:x11/xcb-util XVMC_USE= XORG=x11,xcb,xvmc XVMC_CONFIGURE_ENABLE= xvmc XVMC_VARS= USE_LDCONFIG=yes post-patch: .if ${CONFIGURE_ARGS:M--with-default-accel=uxa} @${REINPLACE_CMD} '/^Default/s/SNA/UXA/' ${WRKSRC}/man/intel.man .endif .include diff --git a/x11-drivers/xf86-video-intel/files/patch-prefer-iris b/x11-drivers/xf86-video-intel/files/patch-prefer-iris index 4c10f2e66fc0..753bd029eb3e 100644 --- a/x11-drivers/xf86-video-intel/files/patch-prefer-iris +++ b/x11-drivers/xf86-video-intel/files/patch-prefer-iris @@ -1,30 +1,31 @@ Chase https://gitlab.freedesktop.org/mesa/mesa/-/commit/adaa3583f507 +Chase https://gitlab.freedesktop.org/mesa/mesa/-/commit/cdde031ac2c8 ---- src/sna/sna_dri2.c.orig 2020-11-16 15:23:28 UTC +--- src/sna/sna_dri2.c.orig 2021-01-15 20:59:05 UTC +++ src/sna/sna_dri2.c @@ -3707,8 +3707,10 @@ static const char *dri_driver_name(struct sna *sna) return has_i830_dri() ? "i830" : "i915"; else if (sna->kgem.gen < 040) return "i915"; -- else + else if (sna->kgem.gen < 0100) - return "i965"; -+ else ++ return "crocus"; + else +- return "i965"; + return "iris"; } return s; ---- src/uxa/intel_dri.c.orig 2020-11-16 15:23:28 UTC +--- src/uxa/intel_dri.c.orig 2021-01-15 20:59:05 UTC +++ src/uxa/intel_dri.c @@ -1540,8 +1540,10 @@ static const char *dri_driver_name(intel_screen_privat return has_i830_dri() ? "i830" : "i915"; else if (INTEL_INFO(intel)->gen < 040) return "i915"; -- else + else if (INTEL_INFO(intel)->gen < 0100) - return "i965"; -+ else ++ return "crocus"; + else +- return "i965"; + return "iris"; } return s;