diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile index edc1c1cdf25d..f121f9571945 100644 --- a/x11-servers/xephyr/Makefile +++ b/x11-servers/xephyr/Makefile @@ -1,28 +1,28 @@ PORTNAME= xephyr -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= X server from X.Org based on kdrive LICENSE= MIT LIB_DEPENDS+= libxcb-image.so:x11/xcb-util-image \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-util.so:x11/xcb-util MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr SLAVE_PORT= yes USE_XORG= x11 xcb CONFIGURE_ARGS+=--enable-xephyr --disable-dmx --disable-xnest --disable-xvfb \ --enable-kdrive --disable-xwayland PLIST_FILES= bin/Xephyr man/man1/Xephyr.1.gz do-install: cd ${WRKSRC}/hw/kdrive/ephyr; DESTDIR=${STAGEDIR} ${MAKE} install .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile index 1d21bba0bee4..697ccda7b6b2 100644 --- a/x11-servers/xorg-dmx/Makefile +++ b/x11-servers/xorg-dmx/Makefile @@ -1,22 +1,22 @@ # Created by: lesi@FreeBSD.org PORTNAME= xorg-dmx -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= Distributed Multihead X from X.Org LICENSE= MIT MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr SLAVE_PORT= yes USE_XORG= dmx xorgproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst CONFIGURE_ARGS+=--enable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ --disable-xwayland do-install: cd ${WRKSRC}/hw/dmx; DESTDIR=${STAGEDIR} ${MAKE} install .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index 08afdfea4d5e..02323aaba273 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -1,27 +1,27 @@ # Created by: Eric Anholt PORTNAME= xorg-nestserver -PORTREVISION= 1 +PORTREVISION= 0 PORTEPOCH= 2 COMMENT= Nesting X server from X.Org LICENSE= MIT MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr RUN_DEPENDS= xkeyboard-config>=2.5:x11/xkeyboard-config SLAVE_PORT= yes USE_XORG= x11 xext CONFIGURE_ARGS+=--enable-xnest --disable-dmx --disable-xephyr --disable-xvfb \ --disable-xwayland PLIST_FILES= bin/Xnest man/man1/Xnest.1.gz do-install: cd ${WRKSRC}/hw/xnest; DESTDIR=${STAGEDIR} ${MAKE} install .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 5859e6293579..147167b5aa9f 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -1,124 +1,124 @@ # Created by: Eric Anholt PORTNAME?= xorg-server -PORTVERSION?= 1.20.11 -PORTREVISION?= 3 +PORTVERSION?= 1.20.13 +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 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 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 +USES= compiler:c11 cpe gl gmake perl5 ssl tar:xz 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 CPE_PRODUCT= xorg-server .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} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le 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 diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index e0ffd2e4de8d..5e86ce216f32 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1618327364 -SHA256 (xorg/xserver/xorg-server-1.20.11.tar.bz2) = 914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49 -SIZE (xorg/xserver/xorg-server-1.20.11.tar.bz2) = 6476116 -SHA256 (xorg/xserver/06d1a032ee491547f7037c3ff042065dc2aeaa99.diff) = 2e0f1027e56e1512f659dc5cc48400de9bea722e516b05498a7c6a4130f09f55 -SIZE (xorg/xserver/06d1a032ee491547f7037c3ff042065dc2aeaa99.diff) = 3867 -SHA256 (xorg/xserver/7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b.diff) = 5f0996f07af30d6d55713def544aa4b3280909ed91a36cd495ca2ace517b328b -SIZE (xorg/xserver/7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b.diff) = 3606 +TIMESTAMP = 1634455742 +SHA256 (xorg/xserver/xorg-server-1.20.13.tar.xz) = 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300 +SIZE (xorg/xserver/xorg-server-1.20.13.tar.xz) = 5122260 diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index 3967261dfb2d..7e868cc68be7 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -1,24 +1,24 @@ # Created by: Eric Anholt PORTNAME= xorg-vfbserver -PORTREVISION= 1 +PORTREVISION= 0 PORTEPOCH= 1 COMMENT= X virtual framebuffer server from X.Org LICENSE= MIT MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr SLAVE_PORT= yes CONFIGURE_ARGS+=--enable-xvfb --disable-dmx --disable-xephyr --disable-xnest \ --disable-xwayland PLIST_FILES= bin/Xvfb man/man1/Xvfb.1.gz do-install: cd ${WRKSRC}/hw/vfb; DESTDIR=${STAGEDIR} ${MAKE} install .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile index 4a02741db209..5d0a02e9061c 100644 --- a/x11-servers/xwayland/Makefile +++ b/x11-servers/xwayland/Makefile @@ -1,36 +1,36 @@ PORTNAME= xwayland -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= X Clients under Wayland LICENSE= MIT BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libinput.so:x11/libinput CONFLICTS_INSTALL= ${PORTNAME}-devel MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr SLAVE_PORT= yes USE_XORG= x11 xext USE_GL+= egl gbm CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ --enable-xwayland --with-default-xkb-ruleset=evdev PLIST_FILES= bin/Xwayland OPTIONS_DEFINE= NVIDIA NVIDIA_DESC= EGLStream support for glamor on Xwayland NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland NVIDIA_CONFIGURE_ENABLE=xwayland-eglstream do-install: cd ${WRKSRC}/hw/xwayland; DESTDIR=${STAGEDIR} ${MAKE_CMD} install .include "${MASTERDIR}/Makefile"