svn commit: r524048 - in head/x11-servers: xephyr xorg-dmx xorg-nestserver xorg-server xorg-vfbserver xwayland
Jan Beich
jbeich at FreeBSD.org
Sat Jan 25 16:26:43 UTC 2020
Author: jbeich
Date: Sat Jan 25 16:26:41 2020
New Revision: 524048
URL: https://svnweb.freebsd.org/changeset/ports/524048
Log:
x11-servers/xorg-server: expose UDEV support for evdev hotplug
UDEV builds Xorg against libudev-devd, allowing automatic detection of
/dev/input/* (evdev) devices with xf86-input-libinput or xf86-input-evdev.
PR: 222609
Submitted by: Greg V <greg at unrelenting.technology>
Tested by: Ivan <bsd at abinet.ru>, manu
Approved by: x11 (bapt via IRC)
Modified:
head/x11-servers/xephyr/Makefile (contents, props changed)
head/x11-servers/xorg-dmx/Makefile (contents, props changed)
head/x11-servers/xorg-nestserver/Makefile (contents, props changed)
head/x11-servers/xorg-server/Makefile (contents, props changed)
head/x11-servers/xorg-server/pkg-plist (contents, props changed)
head/x11-servers/xorg-vfbserver/Makefile (contents, props changed)
head/x11-servers/xwayland/Makefile (contents, props changed)
Modified: head/x11-servers/xephyr/Makefile
==============================================================================
--- head/x11-servers/xephyr/Makefile Sat Jan 25 16:24:10 2020 (r524047)
+++ head/x11-servers/xephyr/Makefile Sat Jan 25 16:26:41 2020 (r524048)
@@ -16,7 +16,7 @@ MASTERDIR= ${.CURDIR}/../xorg-server
DESCR= ${.CURDIR}/pkg-descr
SLAVE_PORT= yes
-OPTIONS_EXCLUDE=DEVD HAL SUID
+OPTIONS_EXCLUDE=DEVD HAL SUID UDEV
USE_XORG= x11 xcb
Modified: head/x11-servers/xorg-dmx/Makefile
==============================================================================
--- head/x11-servers/xorg-dmx/Makefile Sat Jan 25 16:24:10 2020 (r524047)
+++ head/x11-servers/xorg-dmx/Makefile Sat Jan 25 16:26:41 2020 (r524048)
@@ -11,7 +11,7 @@ MASTERDIR= ${.CURDIR}/../xorg-server
DESCR= ${.CURDIR}/pkg-descr
SLAVE_PORT= yes
-OPTIONS_EXCLUDE=DEVD HAL SUID
+OPTIONS_EXCLUDE=DEVD HAL SUID UDEV
USE_XORG= dmx xorgproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst
Modified: head/x11-servers/xorg-nestserver/Makefile
==============================================================================
--- head/x11-servers/xorg-nestserver/Makefile Sat Jan 25 16:24:10 2020 (r524047)
+++ head/x11-servers/xorg-nestserver/Makefile Sat Jan 25 16:26:41 2020 (r524048)
@@ -17,7 +17,7 @@ PATCHDIR= ${.CURDIR}/files
RUN_DEPENDS= xkeyboard-config>=2.5:x11/xkeyboard-config
SLAVE_PORT= yes
-OPTIONS_EXCLUDE=DEVD HAL SUID
+OPTIONS_EXCLUDE=DEVD HAL SUID UDEV
USE_XORG= x11 xext xfont2
Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile Sat Jan 25 16:24:10 2020 (r524047)
+++ head/x11-servers/xorg-server/Makefile Sat Jan 25 16:26:41 2020 (r524048)
@@ -22,9 +22,10 @@ SLAVE_PORT?= no
OPTIONS_SUB= yes
OPTIONS_DEFINE= SUID
OPTIONS_RADIO= CONF
-OPTIONS_RADIO_CONF= DEVD HAL
+OPTIONS_RADIO_CONF= DEVD HAL UDEV
DEVD_DESC= Use devd for autoconfiguration of input devices
HAL_DESC= Use hald for autoconfiguration of input devices
+UDEV_DESC= Use udev via libudev-devd for autoconfiguration of input devices
SUID_DESC= Install the Xorg server with setuid bit set
OPTIONS_DEFAULT=DEVD SUID
@@ -52,7 +53,7 @@ USE_XORG+= pixman xau xdmcp xfont xkbfile xorgproto xs
CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \
--with-default-font-path="$$(${DEFAULT_FONTPATH_CMD})" \
--localstatedir=/var --with-shared-memory-dir=/tmp \
- --disable-config-udev --disable-config-udev-kms \
+ --disable-config-udev-kms --disable-systemd-logind \
--without-dtrace --enable-glamor
INSTALL_TARGET= install-strip
@@ -90,6 +91,13 @@ LIB_DEPENDS+= libhal.so:sysutils/hal
CONFIGURE_ARGS+= --enable-config-hal
.else
CONFIGURE_ARGS+= --disable-config-hal
+.endif
+
+.if ${PORT_OPTIONS:MUDEV}
+LIB_DEPENDS+= libudev.so:devel/libudev-devd
+CONFIGURE_ARGS+= --enable-config-udev
+.else
+CONFIGURE_ARGS+= --disable-config-udev
.endif
# We handle Xorg setuid in the plist. This allows to build xorg-server as a user.
Modified: head/x11-servers/xorg-server/pkg-plist
==============================================================================
--- head/x11-servers/xorg-server/pkg-plist Sat Jan 25 16:24:10 2020 (r524047)
+++ head/x11-servers/xorg-server/pkg-plist Sat Jan 25 16:26:41 2020 (r524048)
@@ -185,6 +185,7 @@ man/man4/fbdevhw.4.gz
man/man4/modesetting.4.gz
man/man5/xorg.conf.5.gz
man/man5/xorg.conf.d.5.gz
+%%UDEV%%share/X11/xorg.conf.d/10-quirks.conf
share/aclocal/xorg-server.m4
@dir etc/X11/xorg.conf.d
@dir %%FONTPATHD%%
Modified: head/x11-servers/xorg-vfbserver/Makefile
==============================================================================
--- head/x11-servers/xorg-vfbserver/Makefile Sat Jan 25 16:24:10 2020 (r524047)
+++ head/x11-servers/xorg-vfbserver/Makefile Sat Jan 25 16:26:41 2020 (r524048)
@@ -15,7 +15,7 @@ DISTINFO_FILE= ${.CURDIR}/distinfo
PATCHDIR= ${.CURDIR}/files
SLAVE_PORT= yes
-OPTIONS_EXCLUDE=DEVD HAL SUID
+OPTIONS_EXCLUDE=DEVD HAL SUID UDEV
USE_XORG= xfont2
Modified: head/x11-servers/xwayland/Makefile
==============================================================================
--- head/x11-servers/xwayland/Makefile Sat Jan 25 16:24:10 2020 (r524047)
+++ head/x11-servers/xwayland/Makefile Sat Jan 25 16:26:41 2020 (r524048)
@@ -21,7 +21,7 @@ DISTINFO_FILE= ${.CURDIR}/distinfo
PATCHDIR= ${.CURDIR}/files
SLAVE_PORT= yes
-OPTIONS_EXCLUDE=DEVD HAL SUID
+OPTIONS_EXCLUDE=DEVD HAL SUID UDEV
USE_XORG= x11 xext xfont2
USE_GL+= egl gbm
More information about the svn-ports-all
mailing list