Page MenuHomeFreeBSD
Files F144456811

No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 0a42133963d7..cd12df3472e5 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -1,135 +1,134 @@
PORTNAME= xorg
-PORTVERSION= 21.1.18
-PORTREVISION= 1
+PORTVERSION= 21.1.20
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
WWW= https://www.freedesktop.org/Software/xorg
LICENSE= MIT
FLAVORS= xorg xnest xephyr xvfb
FLAVOR?= ${FLAVORS:[1]}
USES= compiler:c11 cpe gl meson pkgconfig tar:xz xorg
USE_GL= gl
.if ${FLAVOR} == xephyr
PORTNAME= xephyr
.elif ${FLAVOR} == xorg
PKGNAMESUFFIX= -server
.elif ${FLAVOR} == xnest
PORTEPOCH= 2
PKGNAMESUFFIX= -nestserver
.elif ${FLAVOR} == xvfb
PKGNAMESUFFIX= -vfbserver
.endif
.if ${FLAVOR} != xorg
PLIST=
PKGMESSAGE=
BINARY_NAME= ${FLAVOR:C/^(.).*/\1/:tu}${FLAVOR:C/^.//}
PLIST_FILES= bin/${BINARY_NAME} \
share/man/man1/${BINARY_NAME}.1.gz
.endif
DESCR= ${.CURDIR}/pkg-descr-${FLAVOR}
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \
xkbcomp:x11/xkbcomp \
${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
MESON_ARGS+= -Dxwin=false \
-Dxquartz=false \
-Ddtrace=false \
-Dhal=false \
-Dsystemd_logind=false \
-Dxselinux=false \
-Dfallback_input_driver=libinput \
-Ddocs=false \
-Dxcsecurity=true \
-Dsecure-rpc=false \
-D${FLAVOR}=true
.for f in ${FLAVORS:N${FLAVOR}}
MESON_ARGS+= -D${f}=false
.endfor
.if ${FLAVOR} == xorg
LIB_DEPENDS+= libudev.so:devel/libudev-devd \
libxcvt.so:x11/libxcvt
MESON_ARGS+= -Dudev=true \
-Dudev_kms=true \
-Dlog_dir=/var/log \
-Dsuid_wrapper=true
.else
MESON_ARGS+= -Dudev=false \
-Dudev_kms=false
.endif
.if ${FLAVOR} == xorg || ${FLAVOR} == xephyr
MESON_ARGS+= -Ddrm=true
LIB_DEPENDS+= libdrm.so:graphics/libdrm \
libepoxy.so:graphics/libepoxy
.endif
.if ${FLAVOR} == xephyr
LIB_DEPENDS+= libxcb-render-util.so:x11/xcb-util-renderutil \
libxcb-image.so:x11/xcb-util-image \
libxcb-icccm.so:x11/xcb-util-wm \
libxcb-keysyms.so:x11/xcb-util-keysyms
.endif
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}
MESON_ARGS+= -Ddefault_font_path=${DEFAULT_FONTPATH_LIST:ts,}
PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}"
USE_GL+= gl
USE_XORG+= pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans
CPE_VENDOR= x.org
CPE_PRODUCT= xorg-server
.if ${FLAVOR} == xorg
USE_GL+= gbm
USE_XORG+= pciaccess
.endif
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD
MESON_ARGS+= -Dsha1=libmd
.endif
.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
LIB_DEPENDS+= libunwind.so:devel/libunwind
.endif
.if ${FLAVOR} == xorg
post-install:
@${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
.else
post-install:
${RM} -r ${STAGEDIR}${PREFIX}/lib/xorg/protocol.txt
${RMDIR} ${STAGEDIR}${PREFIX}/lib/xorg
${RM} ${STAGEDIR}${PREFIX}/share/man/man1/Xserver.1
.endif
.include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 8f721320a402..b423782eb258 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751356772
-SHA256 (xorg-server-21.1.18.tar.xz) = c878d1930d87725d4a5bf498c24f4be8130d5b2646a9fd0f2994deff90116352
-SIZE (xorg-server-21.1.18.tar.xz) = 5037376
+TIMESTAMP = 1762267216
+SHA256 (xorg-server-21.1.20.tar.xz) = 7695bc61824b3a81b6bad2f78b05400ca015003de402d1b322117105b702e937
+SIZE (xorg-server-21.1.20.tar.xz) = 5055676

File Metadata

Mime Type
text/x-diff
Expires
Sun, Mar 29, 12:56 PM (1 d, 14 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28212646
Default Alt Text
(4 KB)

Event Timeline