[notify] xorg-server: 1.20.13 -> 21.1.0; new dependency: xorg-libxcvt

3 files changed, 15 insertions, 31 deletions

diff --git a/xorg-server/.footprint b/xorg-server/.footprint
index 0b81ba94..813cff82 100644
--- a/xorg-server/.footprint
+++ b/xorg-server/.footprint
@@ -8,13 +8,9 @@ lrwxrwxrwx	root/root	usr/bin/X -> Xorg
 -rwxr-xr-x	root/root	usr/bin/Xnest
 -rwxr-xr-x	root/root	usr/bin/Xorg
 -rwxr-xr-x	root/root	usr/bin/Xvfb
--rwxr-xr-x	root/root	usr/bin/cvt
 -rwxr-xr-x	root/root	usr/bin/gtf
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/xorg/
--rw-r--r--	root/root	usr/include/xorg/BT.h
--rw-r--r--	root/root	usr/include/xorg/IBM.h
--rw-r--r--	root/root	usr/include/xorg/TI.h
 -rw-r--r--	root/root	usr/include/xorg/XIstubs.h
 -rw-r--r--	root/root	usr/include/xorg/Xprintf.h
 -rw-r--r--	root/root	usr/include/xorg/callback.h
@@ -118,7 +114,6 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/shadow.h
 -rw-r--r--	root/root	usr/include/xorg/shadowfb.h
 -rw-r--r--	root/root	usr/include/xorg/shmint.h
--rw-r--r--	root/root	usr/include/xorg/site.h
 -rw-r--r--	root/root	usr/include/xorg/syncsdk.h
 -rw-r--r--	root/root	usr/include/xorg/validate.h
 -rw-r--r--	root/root	usr/include/xorg/vbe.h
@@ -131,6 +126,7 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/xaarop.h
 -rw-r--r--	root/root	usr/include/xorg/xace.h
 -rw-r--r--	root/root	usr/include/xorg/xacestr.h
+-rw-r--r--	root/root	usr/include/xorg/xf86-input-inputtest-protocol.h
 -rw-r--r--	root/root	usr/include/xorg/xf86.h
 -rw-r--r--	root/root	usr/include/xorg/xf86Crtc.h
 -rw-r--r--	root/root	usr/include/xorg/xf86Cursor.h
@@ -146,7 +142,6 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/xf86PciInfo.h
 -rw-r--r--	root/root	usr/include/xorg/xf86Priv.h
 -rw-r--r--	root/root	usr/include/xorg/xf86Privstr.h
--rw-r--r--	root/root	usr/include/xorg/xf86RamDac.h
 -rw-r--r--	root/root	usr/include/xorg/xf86RandR12.h
 -rw-r--r--	root/root	usr/include/xorg/xf86VGAarbiter.h
 -rw-r--r--	root/root	usr/include/xorg/xf86Xinput.h
@@ -178,21 +173,21 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/xorg-server.pc
 drwxr-xr-x	root/root	usr/lib/xorg-server/
 -rwxr-xr-x	root/root	usr/lib/xorg-server/Xorg
--rwsr-xr-x	root/root	usr/lib/xorg-server/Xorg.wrap
+-r-xr-xr-x	root/root	usr/lib/xorg-server/Xorg.wrap
 drwxr-xr-x	root/root	usr/lib/xorg/
 drwxr-xr-x	root/root	usr/lib/xorg/modules/
 drwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/modesetting_drv.so
 drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so
+drwxr-xr-x	root/root	usr/lib/xorg/modules/input/
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/inputtest_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/libexa.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libfb.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/libfbdevhw.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/libglamoregl.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/libint10.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/libshadow.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/libshadowfb.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libvbe.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/libvgahw.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/libwfb.so
 -rw-r--r--	root/root	usr/lib/xorg/protocol.txt
@@ -209,11 +204,11 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/Xorg.wrap.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/Xserver.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/Xvfb.1.gz
--rw-r--r--	root/root	usr/share/man/man1/cvt.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/gtf.1.gz
 drwxr-xr-x	root/root	usr/share/man/man4/
 -rw-r--r--	root/root	usr/share/man/man4/exa.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/fbdevhw.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/inputtestdrv.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/modesetting.4.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/Xwrapper.config.5.gz
diff --git a/xorg-server/.signature b/xorg-server/.signature
index 163ad934..8d830c6f 100644
--- a/xorg-server/.signature
+++ b/xorg-server/.signature
@@ -1,8 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndLhIOH9WW40ag9meVTBT41j2euy+39t6SxJab8pSahrslJVeJhmIieh98DbtnC+NbMiIDZ/S7xZaIu7AkkNb6gE=
-SHA256 (Pkgfile) = 1fe0ef5075fc94673aabf5a0bb1d76f8c79e32dd21462c597ae82d00c9f09051
-SHA256 (.footprint) = 55c554708443642282d937bc16b45a93bddece9c8be60df98596b140e6f5ba83
-SHA256 (xorg-server-1.20.13.tar.xz) = 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
-SHA256 (0001-v2-FS-58644.patch) = 6253fb5cf06cf650539be585d6ca13cfa00217b51ca9825476c8fd55c09341a4
-SHA256 (xserver-autobind-hotplug.patch) = cae1b7f296c18177de38f9b1215a4f916da2288b85f1fcb9e80373a42e2892b8
-SHA256 (0002-fix-libshadow-2.patch) = d07b2fe55828dad61517a80c77f6f183113916f5e1fce30ff43041550d58bd6e
+RWTSGWF5Q7TndDA+YSahr9yvaXD0qkVmuwYqPQ7wIBI/ImLm/DPQQVvZ9xBMo+HwPfKXlQr04QAaXckiAyhjjni/K8eu+Phbnwc=
+SHA256 (Pkgfile) = d1eedd89e1cb01fe42514c3ee1175c30d8991ef204ee6cf7f89acba35e7a83ff
+SHA256 (.footprint) = 6838beebf40c1bc6c7ea5e8863aed234277a59f1a4a1c733c715a89250c16755
+SHA256 (xserver-xorg-server-21.1.0.tar.bz2) = f8fe88731d8bde9b9d889ea9c4c397ffc7e963111b1feba6c4d935dd8a38ec92
diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile
index 2cd68591..0ae9bcfe 100644
--- a/xorg-server/Pkgfile
+++ b/xorg-server/Pkgfile
@@ -1,22 +1,15 @@
 # Description: X Window System server
 # URL: http://xorg.freedesktop.org
 # Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu
-# Depends on: libepoxy nettle xorg-bdftopcf xorg-font-util xorg-libdmx xorg-libxaw xorg-libxcomposite xorg-libxcursor xorg-libxfont2 xorg-libxft xorg-libxinerama xorg-libxres xorg-libxtst xorg-libxxf86dga xorg-mkfontscale xorg-xcb-util-keysyms xorg-xkbcomp
+# Depends on: libepoxy nettle xorg-bdftopcf xorg-font-util xorg-libdmx xorg-libxaw xorg-libxcomposite xorg-libxcursor xorg-libxcvt xorg-libxfont2 xorg-libxft xorg-libxinerama xorg-libxres xorg-libxtst xorg-libxxf86dga xorg-mkfontscale xorg-xcb-util-keysyms xorg-xkbcomp
 
 name=xorg-server
-version=1.20.13
-release=4
-source=(https://www.x.org/releases/individual/xserver/$name-$version.tar.xz
-	0001-v2-FS-58644.patch xserver-autobind-hotplug.patch
-	0002-fix-libshadow-2.patch)
+version=21.1.0
+release=1
+source=(https://gitlab.freedesktop.org/xorg/xserver/-/archive/xorg-server-21.1.0/xserver-xorg-server-21.1.0.tar.bz2)
 
 build() {
-	# https://bugs.freedesktop.org/show_bug.cgi?id=106588
-	patch -Np1 -d $SRC/$name-$version -i $SRC/0001-v2-FS-58644.patch
-	patch -Np1 -d $SRC/$name-$version -i $SRC/0002-fix-libshadow-2.patch
-	patch -Np1 -d $SRC/$name-$version -i $SRC/xserver-autobind-hotplug.patch
-
-	meson setup $name-$version build \
+	meson setup xserver-$name-$version build \
 		--prefix=/usr \
 		--libexecdir=/usr/lib/$name \
 		--localstatedir=/var \
@@ -24,7 +17,6 @@ build() {
 		--wrap-mode nodownload \
 		-D b_lto=true \
 		-D b_pie=true \
-		-D os_vendor="CRUX" \
 		-D xkb_dir=/usr/share/X11/xkb \
 		-D xkb_output_dir=/var/lib/xkb \
 		-D suid_wrapper=true \
@@ -32,7 +24,7 @@ build() {
 	meson compile -C build
 	DESTDIR=$PKG meson install -C build
 
-	ln -s Xorg $PKG/usr/bin/X
+	#ln -s Xorg $PKG/usr/bin/X
 	install -m 755 -d $PKG/etc/X11/xorg.conf.d
 	echo "needs_root_rights = yes" >> $PKG/etc/X11/Xwrapper.config
 }