From 6581dfb37295e085067520bc307b20d2357dd934 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 11 Mar 2019 18:23:31 +0000
Subject: user/xorg-server: bump to 1.20.4, modernise

---
 user/xorg-server/APKBUILD                 | 21 +++++++--------------
 user/xorg-server/support-coffeelake.patch | 14 --------------
 2 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 user/xorg-server/support-coffeelake.patch

diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD
index e5f0041eb..d76a21347 100644
--- a/user/xorg-server/APKBUILD
+++ b/user/xorg-server/APKBUILD
@@ -1,22 +1,21 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=xorg-server
-pkgver=1.20.3
-pkgrel=2
+pkgver=1.20.4
+pkgrel=0
 pkgdesc="X.Org X11 server"
 url="https://www.X.Org/"
 arch="all"
 license="MIT"
 options="suid"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xvfb $pkgname-xephyr
-	$pkgname-xnest $pkgname-xwayland"
+	$pkgname-xnest"
 # the modesetting driver is now shipped with xorg server
 replaces="xf86-video-modesetting"
 depends="font-cursor-misc font-misc-misc xkeyboard-config xkbcomp xinit"
 depends_dev="libepoxy-dev libxfont2-dev mesa-dev"
 makedepends="$depends_dev autoconf automake libtool util-macros
-	eudev-dev libpciaccess-dev
-	libdrm-dev libepoxy-dev pixman-dev wayland-dev wayland-protocols
+	eudev-dev libpciaccess-dev libdrm-dev libepoxy-dev pixman-dev
 	libx11-dev libxdamage-dev libxinerama-dev libxkbfile-dev libxkbui-dev
 	libxv-dev libxxf86dga-dev libxxf86misc-dev xcb-util-dev
 	xcb-util-image-dev xcb-util-keysyms-dev xcb-util-renderutil-dev
@@ -27,7 +26,6 @@ makedepends="$depends_dev autoconf automake libtool util-macros
 source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2
 	autoconfig-sis.patch
 	fix-musl-arm.patch
-	support-coffeelake.patch
 	"
 
 # secfixes:
@@ -50,7 +48,6 @@ source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2
 #     - CVE-2017-13723
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 
 	# Fix dbus config path
@@ -59,7 +56,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	[ "$CLIBC" == musl ] && export CFLAGS="$CFLAGS -D__gid_t=gid_t -D__uid_t=uid_t"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
@@ -87,7 +83,7 @@ build() {
 		--enable-xorg \
 		--enable-xres \
 		--enable-xv \
-		--enable-xwayland \
+		--disable-xwayland \
 		--disable-config-hal \
 		--disable-dmx \
 		--disable-systemd-logind \
@@ -97,12 +93,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 	chmod u+s "$pkgdir"/usr/bin/Xorg
 
@@ -140,7 +134,6 @@ xwayland() {
 	mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/
 }
 
-sha512sums="ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba  xorg-server-1.20.3.tar.bz2
+sha512sums="f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8  xorg-server-1.20.4.tar.bz2
 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200  autoconfig-sis.patch
-b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09  fix-musl-arm.patch
-1deae020ffd7e3ea91d8d3d8118dbb80c5d08308d9a253deaa3afc42f93ff13d1a93d3aaca7acce5d45213dee9c072a15c3ed385432bc833f403e7c8472e9fd6  support-coffeelake.patch"
+b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09  fix-musl-arm.patch"
diff --git a/user/xorg-server/support-coffeelake.patch b/user/xorg-server/support-coffeelake.patch
deleted file mode 100644
index 99f12aada..000000000
--- a/user/xorg-server/support-coffeelake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This PCI ID has been seen in the wild on the i7-9700K.
-
-diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
-index 82e4a549e..1ef1a0edf 100644
---- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
-+++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
-@@ -174,6 +174,7 @@ CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
- CHIPSET(0x3E91, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
- CHIPSET(0x3E92, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
- CHIPSET(0x3E96, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
-+CHIPSET(0x3E98, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
- CHIPSET(0x3E9A, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
- CHIPSET(0x3E9B, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
- CHIPSET(0x3E94, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
-- 
cgit v1.2.3-60-g2f50