community/xorg-server: upgrade to 21.1.1

remove patches, fixed upstream
remove 'ln -s /usr/bin/Xorg "$pkgdir"/usr/bin/X', fixed upstream
add '-Wno-error=array-bounds' to CFLAGS to fix build on 32bit arches
remove unused meson options
add libxcvt to makedepends

5 files changed, 4 insertions, 128 deletions

diff --git a/community/xorg-server/0001-compiler.h-ensure-IOPortBase-is-declared-extern-on-m.patch b/community/xorg-server/0001-compiler.h-ensure-IOPortBase-is-declared-extern-on-m.patch
deleted file mode 100644
index 42f04bb165..0000000000
--- a/community/xorg-server/0001-compiler.h-ensure-IOPortBase-is-declared-extern-on-m.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1efee15daaaf7c7c3ea7f9fd6d5c8ec8605a09c7 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 3 Sep 2020 17:50:26 -0600
-Subject: [PATCH] compiler.h: ensure IOPortBase is declared extern on mips
-
-This is needed to fix compilation with -fcommon on GCC, which
-is the default in GCC 10.
-
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
----
- hw/xfree86/common/compiler.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
-index 2b2008b3f..c7d617eb1 100644
---- a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
- #define PORT_SIZE short
- #endif
- 
--_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
-+extern _X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
- 
- static __inline__ void
- outb(unsigned PORT_SIZE port, unsigned char val)
--- 
-2.28.0
-
diff --git a/community/xorg-server/APKBUILD b/community/xorg-server/APKBUILD
index 4c5fc38a04..69d1f50e76 100644
--- a/community/xorg-server/APKBUILD
+++ b/community/xorg-server/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
-pkgver=1.20.13
+pkgver=21.1.1
 pkgrel=0
 pkgdesc="X.Org X servers"
 url="https://www.x.org/wiki"
@@ -49,6 +49,7 @@ makedepends="
 	libxext-dev
 	libx11-dev
 	libxau-dev
+	libxcvt-dev
 	eudev-dev
 	libxcb-dev
 	xcb-util-dev
@@ -59,10 +60,6 @@ makedepends="
 	libxdmcp-dev
 	"
 source="https://www.x.org/releases/individual/xserver/xorg-server-$pkgver.tar.xz
-	link-libshadow.patch
-	e50c85f4ebf559a3bac4817b41074c43d4691779.patch
-	0001-compiler.h-ensure-IOPortBase-is-declared-extern-on-m.patch
-	meson-install-xorg-wrap-script.patch
 	"
 
 # secfixes:
@@ -105,18 +102,15 @@ build() {
 	# xorg modules does not work with the -z now and it seems like we
 	# cannot pass over the linker flag to .so files. so we tweak the
 	# gcc specs.
-	export CFLAGS="$CFLAGS -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t"
+	export CFLAGS="$CFLAGS -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t -Wno-error=array-bounds"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	_fontroot="/usr/share/fonts"
 
 	abuild-meson \
 		-Dxorg=true \
 		-Dxephyr=true \
-		-Dxwayland=false \
 		-Dglamor=true \
-		-Dxwayland_eglstream=false \
 		-Dxnest=true \
-		-Ddmx=false \
 		-Dxvfb=true \
 		-Dxwin=false \
 		-Ddefault_font_path=$_fontroot/misc,$_fontroot/100dpi:unscaled,$_fontroot/75dpi:unscaled,$_fontroot/TTF,$_fontroot/Type1 \
@@ -128,7 +122,6 @@ build() {
 		-Dipv6=true \
 		-Dxkb_dir=/usr/share/X11/xkb \
 		-Dxkb_output_dir=/var/lib/xkb \
-		-Dos_vendor="${DISTRO_NAME:-Alpine Linux}" \
 		-Dlisten_tcp=false \
 		-Dlisten_unix=true \
 		-Dlisten_local=true \
@@ -153,7 +146,6 @@ package() {
 	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 
 	chmod u+s "$pkgdir"/usr/libexec/Xorg.wrap
-	ln -s /usr/bin/Xorg "$pkgdir"/usr/bin/X
 
 	# Don't conflict with xf86-input-evdev
 	rm -f "$pkgdir"/usr/share/X11/xorg.conf.d/10-evdev.conf
@@ -189,9 +181,5 @@ common() {
 }
 
 sha512sums="
-4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3  xorg-server-1.20.13.tar.xz
-d0f723e6033a77faec118adc64e9d4749270724cbb2b86ca5ff796e1fbaef2d01ebcbb2904d48132b58f3ecf0781b2583744b671b17b7d51a1748f4b461932b0  link-libshadow.patch
-e1a4c630e2bbf9ab47c81d48f2de98e302a0e3d5c2896d07804dc36eef1cd0a4e076bd2ed1be70c0d3b024501e5f540abf1b11548ede74c1af3c82183553a728  e50c85f4ebf559a3bac4817b41074c43d4691779.patch
-a91f861588233c363a7939194d1582114ea216117e5f046b971d6571cb79445ceaaf0a1c6f66781da5b139d9ab8bd260d5dc3ff8c3279410865807561bf4fcee  0001-compiler.h-ensure-IOPortBase-is-declared-extern-on-m.patch
-748e02370ba38bfa02b5e3bc503ad46d6c1fe8c59c7c0288f860a960089d3a6367b57cfcb999b6b354a08bae537baab86f12aed8ecdc381427a8126c4dd3097b  meson-install-xorg-wrap-script.patch
+8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d  xorg-server-21.1.1.tar.xz
 "
diff --git a/community/xorg-server/e50c85f4ebf559a3bac4817b41074c43d4691779.patch b/community/xorg-server/e50c85f4ebf559a3bac4817b41074c43d4691779.patch
deleted file mode 100644
index 114076e164..0000000000
--- a/community/xorg-server/e50c85f4ebf559a3bac4817b41074c43d4691779.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Fri, 26 Oct 2018 17:47:30 -0700
-Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system
- with PCI.
-
-Some Broadcom set-top-box boards have PCI busses, but the GPU is still
-probed through DT.  We would dereference a null busid here in that
-case.
-
-Signed-off-by: Eric Anholt <eric@anholt.net>
----
- hw/xfree86/common/xf86platformBus.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da03d..dadbac6c8f 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -289,7 +289,7 @@ xf86platformProbe(void)
-     for (i = 0; i < xf86_num_platform_devices; i++) {
-         char *busid = xf86_platform_odev_attributes(i)->busid;
- 
--        if (pci && (strncmp(busid, "pci:", 4) == 0)) {
-+        if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) {
-             platform_find_pci_info(&xf86_platform_devices[i], busid);
-         }
- 
--- 
-GitLab
-
diff --git a/community/xorg-server/link-libshadow.patch b/community/xorg-server/link-libshadow.patch
deleted file mode 100644
index 48f8cd1bc9..0000000000
--- a/community/xorg-server/link-libshadow.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
-
-
diff --git a/community/xorg-server/meson-install-xorg-wrap-script.patch b/community/xorg-server/meson-install-xorg-wrap-script.patch
deleted file mode 100644
index d0367d9585..0000000000
--- a/community/xorg-server/meson-install-xorg-wrap-script.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,10 +145,14 @@
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
-+    install_data(
-+        configure_file(
-+            input: 'Xorg.sh.in',
-+            output: 'Xorg.sh',
-+            configuration: conf_data,
-+        ),
-+        rename: 'Xorg',
-+        install_mode: 'rwxr-xr-x',
-         install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-     )
- endif