git: 55b667ca6cc9 - main - x11-servers/xorg-server: Update to 21.1.25

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Kousuke Kannagi <mce_at_FreeBSD.org>
Date: Thu, 08 Oct 2026 13:32:26 UTC
The branch main has been updated by mce:

URL: https://cgit.FreeBSD.org/ports/commit/?id=55b667ca6cc9cf9f172f5fd3d4882026bed91389

commit 55b667ca6cc9cf9f172f5fd3d4882026bed91389
Author:     Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-10-08 05:48:55 +0000
Commit:     Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-10-08 13:31:57 +0000

    x11-servers/xorg-server: Update to 21.1.25
    
    Update WWW.
    Remove the unnecessary MESON_ARGS+=-Ddrm=true for Xephyr.
    Remove the duplicate USE_GL+=gl.
    Remove the applied powerpc patch.
    
    https://lists.x.org/archives/xorg-announce/2026-October/003748.html
    
    PR:             299218
    Approved by:    x11 (arrowd)
    Approved by:    osa, fluffy (mentors, implicit)
    MFH:            2026Q4
    Security:       CVE-2026-88812
    Security:       CVE-2026-93515
    Security:       CVE-2026-93516
    Security:       CVE-2026-93517
    Security:       CVE-2026-93518
    Security:       CVE-2026-93519
    Security:       CVE-2026-93520
    Security:       CVE-2026-93521
    Security:       CVE-2026-93522
    Security:       CVE-2026-93523
    Security:       CVE-2026-93524
    Security:       CVE-2026-93536
---
 x11-servers/xorg-server/Makefile                   | 31 ++++++++++++----------
 x11-servers/xorg-server/distinfo                   |  6 ++---
 .../files/patch-hw_xfree86_os-support_meson.build  |  9 +++----
 x11-servers/xorg-server/files/patch-meson.build    | 11 --------
 4 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index d9f613af45ad..d9160786c24a 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	xorg
-PORTVERSION=	21.1.24
+DISTVERSION=	21.1.25
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
-DISTNAME=	xorg-server-${PORTVERSION}
+DISTNAME=	xorg-server-${DISTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X server and related programs
-WWW=		https://www.freedesktop.org/Software/xorg
+WWW=		https://gitlab.freedesktop.org/xorg/xserver
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 FLAVORS=	xorg xnest xephyr xvfb
 FLAVOR?=	${FLAVORS:[1]}
@@ -60,9 +61,12 @@ MESON_ARGS+=	-D${f}=false
 .endfor
 
 .if ${FLAVOR} == xorg
-LIB_DEPENDS+=		libudev.so:devel/libudev-devd \
-			libxcvt.so:x11/libxcvt
-MESON_ARGS+=	-Dudev=true \
+LIB_DEPENDS+=	libdrm.so:graphics/libdrm \
+		libepoxy.so:graphics/libepoxy \
+		libudev.so:devel/libudev-devd \
+		libxcvt.so:x11/libxcvt
+MESON_ARGS+=	-Ddrm=true \
+		-Dudev=true \
 		-Dudev_kms=true \
 		-Dlog_dir=/var/log \
 		-Dsuid_wrapper=true
@@ -71,17 +75,12 @@ 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
+		libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libxcb-util.so:x11/xcb-util
 .endif
 
 FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
@@ -97,7 +96,6 @@ DEFAULT_FONTPATH_LIST= \
 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=	x_server
@@ -105,6 +103,10 @@ CPE_PRODUCT=	x_server
 .if ${FLAVOR} == xorg
 USE_GL+=	gbm
 USE_XORG+=	pciaccess
+.elif ${FLAVOR} == xephyr
+USE_XORG+=	xcb
+.elif ${FLAVOR} == xnest
+USE_XORG+=	x11 xext
 .endif
 
 .include <bsd.port.pre.mk>
@@ -115,6 +117,7 @@ MESON_ARGS+=	-Dsha1=libmd
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
+MESON_ARGS+=	-Dlibunwind=true
 .endif
 
 .if ${FLAVOR} == xorg
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index be4f20f09bca..bea0d86acd9f 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1783480518
-SHA256 (xorg-server-21.1.24.tar.xz) = 1a4eb36ca65cc3b1b936566d677a9786e13c11cd5806e951ac55f3f5ce3984af
-SIZE (xorg-server-21.1.24.tar.xz) = 5072780
+TIMESTAMP = 1791380231
+SHA256 (xorg-server-21.1.25.tar.xz) = 6ad4e3c7b59a309b32c92e5c15ce1267110f9e13f1ac78da62361a628da1a0eb
+SIZE (xorg-server-21.1.25.tar.xz) = 5086684
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
index 73762e37947d..594092bf93a6 100644
--- a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
@@ -1,4 +1,4 @@
---- hw/xfree86/os-support/meson.build.orig	2023-03-29 12:55:03 UTC
+--- hw/xfree86/os-support/meson.build.orig	2026-10-07 01:40:18 UTC
 +++ hw/xfree86/os-support/meson.build
 @@ -96,6 +96,8 @@ elif host_machine.system().endswith('bsd')
          'bsd/bsd_VTsw.c',
@@ -9,15 +9,12 @@
  	'shared/pm_noop.c'
      ]
  
-@@ -111,9 +113,9 @@ elif host_machine.system().endswith('bsd')
+@@ -111,7 +113,7 @@ elif host_machine.system().endswith('bsd')
          if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
              os_dep += cc.find_library('i386')
          endif
 -    elif host_machine.cpu_family() == 'arm'
 +    elif host_machine.cpu_family() == 'arm' or host_machine.cpu_family() == 'aarch64'
          srcs_xorg_os_support += 'bsd/arm_video.c'
--    elif host_machine.cpu_family() == 'powerpc'
-+    elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64'
+     elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64'
          srcs_xorg_os_support += 'bsd/ppc_video.c'
-     elif host_machine.cpu_family() == 'sparc64'
-         srcs_xorg_os_support += 'bsd/sparc64_video.c'
diff --git a/x11-servers/xorg-server/files/patch-meson.build b/x11-servers/xorg-server/files/patch-meson.build
deleted file mode 100644
index 83f00aa7237e..000000000000
--- a/x11-servers/xorg-server/files/patch-meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build.orig	2022-08-05 11:53:38 UTC
-+++ meson.build
-@@ -249,7 +249,7 @@ if int10 == 'auto'
- int10 = get_option('int10')
- if int10 == 'auto'
-     int10 = 'x86emu'
--    if host_machine.cpu() == 'powerpc' and host_machine.system() == 'freebsd'
-+    if host_machine.cpu() == 'ppc' and host_machine.system() == 'freebsd'
-         int10 = 'stub'
-     endif
-     if host_machine.cpu() == 'arm'