git: 0c9a098ef4d0 - main - x11-drivers/xf86-video-intel: Add TOOLS option

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Fri, 26 Jun 2026 19:44:38 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0c9a098ef4d017125ce5c869f710ecb1e2b1573a

commit 0c9a098ef4d017125ce5c869f710ecb1e2b1573a
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-06-26 19:42:31 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-06-26 19:44:29 +0000

    x11-drivers/xf86-video-intel: Add TOOLS option
    
    As a side effect this fixes build in an unclean environment that causes
    autoactivation of the --enable-tools option.
    
    PR:             273422, 277510
---
 x11-drivers/xf86-video-intel/Makefile                    |  7 +++++--
 x11-drivers/xf86-video-intel/files/patch-tools_virtual.c | 13 +++++++++++++
 x11-drivers/xf86-video-intel/pkg-plist                   |  2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index e7c5bbd2fcf3..4d3030d07aeb 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -22,7 +22,6 @@ CPE_VENDOR=	x
 USE_GITLAB=	yes
 GL_TAGNAME=	b74b67f0f321875492968f7097b9d6e82a66d7df
 USE_XORG=	pciaccess pixman
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ENV=	ac_cv_header_sys_sysinfo_h=no # XXX ports/242236
 CONFIGURE_ARGS=	--with-builderstring="${DISTVERSIONFULL}"
 TEST_TARGET=	check
@@ -30,7 +29,7 @@ TEST_TARGET=	check
 # XXX bug 214593: SNA crashes on pre-SandyBridge hardware
 CONFIGURE_ARGS+=--with-default-accel=uxa
 
-OPTIONS_DEFINE=	UDEV XVMC
+OPTIONS_DEFINE=	UDEV TOOLS XVMC
 OPTIONS_DEFAULT=UDEV XVMC
 OPTIONS_SUB=	yes
 
@@ -38,6 +37,10 @@ UDEV_DESC=		udev-based monitor hotplug detection
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_CONFIGURE_ENABLE=	udev
 
+TOOLS_DESC=		Install the intel-virtual-output tool
+TOOLS_USE=		XORG=xrandr,xdamage,xfixes,xcursor,xtst,xrender,xscrnsaver,xext,x11,pixman
+TOOLS_CONFIGURE_ENABLE=	tools
+
 XVMC_LIB_DEPENDS=	libxcb-util.so:x11/xcb-util
 XVMC_USE=		XORG=x11,xcb,xvmc
 XVMC_CONFIGURE_ENABLE=	xvmc
diff --git a/x11-drivers/xf86-video-intel/files/patch-tools_virtual.c b/x11-drivers/xf86-video-intel/files/patch-tools_virtual.c
new file mode 100644
index 000000000000..4417fff2a6dc
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-tools_virtual.c
@@ -0,0 +1,13 @@
+--- tools/virtual.c.orig	2023-02-01 18:07:58 UTC
++++ tools/virtual.c
+@@ -69,6 +69,10 @@
+ #include <fcntl.h>
+ #include <assert.h>
+ 
++#ifndef ETIME
++#define ETIME ETIMEDOUT
++#endif
++
+ #define FORCE_FULL_REDRAW 0
+ #define FORCE_16BIT_XFER 0
+ 
diff --git a/x11-drivers/xf86-video-intel/pkg-plist b/x11-drivers/xf86-video-intel/pkg-plist
index b181bdad5d38..061a9cf3c0d7 100644
--- a/x11-drivers/xf86-video-intel/pkg-plist
+++ b/x11-drivers/xf86-video-intel/pkg-plist
@@ -1,3 +1,4 @@
+%%TOOLS%%bin/intel-virtual-output
 %%XVMC%%lib/libI810XvMC.so
 %%XVMC%%lib/libI810XvMC.so.1
 %%XVMC%%lib/libI810XvMC.so.1.0.0
@@ -5,4 +6,5 @@
 %%XVMC%%lib/libIntelXvMC.so
 %%XVMC%%lib/libIntelXvMC.so.1.0.0
 lib/xorg/modules/drivers/intel_drv.so
+%%TOOLS%%share/man/man4/intel-virtual-output.4x.gz
 share/man/man4/intel.4x.gz