Index: head/x11-servers/xorg-server/Makefile =================================================================== --- head/x11-servers/xorg-server/Makefile (revision 548487) +++ head/x11-servers/xorg-server/Makefile (revision 548488) @@ -1,135 +1,127 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME?= xorg-server -PORTVERSION?= 1.20.8 -PORTREVISION?= 4 +PORTVERSION?= 1.20.9 +PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT?= X.Org X server and related programs - -PATCH_SITES= https://gitlab.freedesktop.org/xorg/xserver/-/commit/ -PATCHFILES+= 271934db9f3b1297754b29855646e0a4ee01db59.diff:-p1 -PATCHFILES+= aac28e162e5108510065ad4c323affd6deffd816.diff:-p1 -PATCHFILES+= 1d3a1092c30af660b1366fcd344af745590aa29f.diff:-p1 -PATCHFILES+= eff3f6cdd398bfac040351e99e64baf3bf64fa2e.diff:-p1 -PATCHFILES+= 5b384e7678c5a155dd8752f018c8292153c1295e.diff:-p1 -PATCHFILES+= 705d7213935820d9f56563ee9e17aa9beb365c1e.diff:-p1 LICENSE= MIT RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ xkbcomp:x11/xkbcomp SLAVE_PORT?= no OPTIONS_SUB= yes OPTIONS_DEFINE+= SUID OPTIONS_RADIO= CONF OPTIONS_RADIO_CONF= DEVD UDEV OPTIONS_DEFAULT= SUID OPTIONS_DEFAULT_FreeBSD_11= DEVD OPTIONS_DEFAULT_FreeBSD_12= UDEV OPTIONS_DEFAULT_FreeBSD_13= UDEV OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} SUID_DESC= Install setuid wrapper to allow startx as non-root CONF_DESC= Backend to use for input device configuration DEVD_DESC= Use devd for autoconfiguration of input devices UDEV_DESC= Use udev via libudev-devd for autoconfiguration of input devices DEVD_CONFIGURE_ENABLE= config-devd SUID_CONFIGURE_ENABLE= suid-wrapper SUID_CONFIGURE_ON= --libexecdir=${PREFIX}/bin # set SUID_WRAPPER_DIR UDEV_CONFIGURE_ENABLE= config-udev UDEV_CONFIGURE_ON= --disable-config-udev-kms UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd .include FONTPATH_ROOT?= ${LOCALBASE}/share/fonts FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/misc/ \ ${FONTPATH_ROOT}/TTF/ \ ${FONTPATH_ROOT}/OTF/ \ ${FONTPATH_ROOT}/Type1/ \ ${FONTPATH_ROOT}/100dpi/ \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} DEFAULT_FONTPATH_CMD=${ECHO_CMD} ${DEFAULT_FONTPATH_LIST} | ${TR} ' ' , PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}" USES= compiler:c11 cpe gl gmake perl5 ssl xorg xorg-cat:xserver USE_PERL5= build USE_GL+= gl USE_XORG+= pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ --with-default-font-path="$$(${DEFAULT_FONTPATH_CMD})" \ --without-dtrace --disable-config-hal \ --disable-install-setuid --disable-unit-tests \ --with-fallback-input-driver=libinput INSTALL_TARGET= install-strip CPE_VENDOR= x.org .if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" || ${PORTNAME} == "xwayland" LIB_DEPENDS+= libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy .else BUILD_DEPENDS+= libepoxy>0:graphics/libepoxy # only for configure .endif .if ${SLAVE_PORT} == "no" USE_GL+= gbm USE_XORG+= pciaccess CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ --disable-xwayland --enable-xcsecurity SUB_FILES= pkg-install pkg-deinstall .else CONFIGURE_ARGS+= --disable-xorg OPTIONS_EXCLUDE= DEVD UDEV SUID # Set PLIST for slave ports so they only need to set PLIST_FILES PLIST= ${.CURDIR}/pkg-plist .endif .include .if ${SSL_DEFAULT} == base # The reason why I use this is cause openssl from base doesn't install a .pc file # and configure will fail trying to find it. Setting both of those variables to # a *non-empty* value by-passes the pkg-config check. CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif .if ${ARCH} == "i386" || ${ARCH} == "amd64" LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if ${ARCH} == "sparc64" PLIST_SUB+= SPARC64="" .else PLIST_SUB+= SPARC64="@comment " .endif post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure .if ${SLAVE_PORT} == "no" post-install: # Avoid conflict with nvidia-driver, move libglx.so into .xorg directory @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg ${MV} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so \ ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d @${MKDIR} ${STAGEDIR}${FONTPATHD} @${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d @${INSTALL_DATA} ${FILESDIR}/20-evdev-kbd.conf \ ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d .endif # ! SLAVE_PORT .include Index: head/x11-servers/xorg-server/distinfo =================================================================== --- head/x11-servers/xorg-server/distinfo (revision 548487) +++ head/x11-servers/xorg-server/distinfo (revision 548488) @@ -1,15 +1,3 @@ -TIMESTAMP = 1598375490 -SHA256 (xorg/xserver/xorg-server-1.20.8.tar.bz2) = d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146 -SIZE (xorg/xserver/xorg-server-1.20.8.tar.bz2) = 6309640 -SHA256 (xorg/xserver/271934db9f3b1297754b29855646e0a4ee01db59.diff) = b29a3af8f6d93a5b6e1d4652fca0a76e438884dee8caf03f89148fbc47c98f71 -SIZE (xorg/xserver/271934db9f3b1297754b29855646e0a4ee01db59.diff) = 1262 -SHA256 (xorg/xserver/aac28e162e5108510065ad4c323affd6deffd816.diff) = c1713942583adc12f77a381ed2ee8907ca0d189e08f6a1730948b51744d2f764 -SIZE (xorg/xserver/aac28e162e5108510065ad4c323affd6deffd816.diff) = 520 -SHA256 (xorg/xserver/1d3a1092c30af660b1366fcd344af745590aa29f.diff) = 72dea9d7fa5df4ca5045edf0e60c7b2923e7748bd3fb16178b1b16e23b3f2db7 -SIZE (xorg/xserver/1d3a1092c30af660b1366fcd344af745590aa29f.diff) = 6681 -SHA256 (xorg/xserver/eff3f6cdd398bfac040351e99e64baf3bf64fa2e.diff) = 1d792eaa0498025aa4b90bdc28d37f5a6f95cc86f1392cbc027034be04bff6ed -SIZE (xorg/xserver/eff3f6cdd398bfac040351e99e64baf3bf64fa2e.diff) = 565 -SHA256 (xorg/xserver/5b384e7678c5a155dd8752f018c8292153c1295e.diff) = 3afb7b52b6236beb0e69f606df5da9f031d6bf72b5f002f78e6645861b816b74 -SIZE (xorg/xserver/5b384e7678c5a155dd8752f018c8292153c1295e.diff) = 683 -SHA256 (xorg/xserver/705d7213935820d9f56563ee9e17aa9beb365c1e.diff) = 112b4940462266031cf0b6ac6f0f2a95c498a675798f3aea91dfb55e849570b6 -SIZE (xorg/xserver/705d7213935820d9f56563ee9e17aa9beb365c1e.diff) = 2077 +TIMESTAMP = 1598382481 +SHA256 (xorg/xserver/xorg-server-1.20.9.tar.bz2) = e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571 +SIZE (xorg/xserver/xorg-server-1.20.9.tar.bz2) = 6302902