From 6ec43936e8fc7dc77851dcc2fbeae051d086a298 Mon Sep 17 00:00:00 2001
From: prspkt <prspkt@protonmail.com>
Date: Sun, 22 Jul 2018 02:14:07 +0300
Subject: main/xorg-server: upgrade to 1.20.0

Remove deprecated configuration options '--enable-xfbdev' and '--disable-tslib'.
Remove xfbdev subpackage and add '--enable-dri3' to package configuration.
---
 main/xorg-server/APKBUILD | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index fa3bd4bf833..38df147c03e 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
-pkgver=1.19.6
-pkgrel=3
+pkgver=1.20.0
+pkgrel=0
 pkgdesc="X.Org X servers"
 url="http://xorg.freedesktop.org"
 arch="all"
 license="MIT"
 options="suid"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xfbdev xvfb $pkgname-xephyr
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xvfb $pkgname-xephyr
 	$pkgname-xnest $pkgname-xwayland"
 # the modesetting driver is now shipped with xorg server
 replaces="xf86-video-modesetting"
@@ -115,13 +115,13 @@ build() {
 		--enable-config-udev \
 		--enable-dri \
 		--enable-dri2 \
+		--enable-dri3 \
 		--enable-glamor \
 		--enable-ipv6 \
 		--enable-kdrive \
 		--enable-xace \
 		--enable-xcsecurity \
 		--enable-xephyr \
-		--enable-xfbdev \
 		--enable-xnest \
 		--enable-xorg \
 		--enable-xres \
@@ -129,10 +129,8 @@ build() {
 		--enable-xwayland \
 		--disable-config-hal \
 		--disable-dmx \
-		--disable-tslib \
 		--disable-systemd-logind \
 		--with-os-vendor="${DISTRO_NAME:-Alpine Linux}"
-
 	make
 }
 
@@ -155,13 +153,6 @@ package() {
 	install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-xfbdev() {
-	pkgdesc="X.org server for framebuffer"
-	depends=
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/Xfbdev "$subpkgdir"/usr/bin/
-}
-
 xvfb() {
 	pkgdesc="Virtual Framebuffer 'fake' X server"
 	mkdir -p "$subpkgdir"/usr/bin
@@ -188,7 +179,7 @@ xwayland() {
 	mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/
 }
 
-sha512sums="38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412  xorg-server-1.19.6.tar.bz2
+sha512sums="1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde  xorg-server-1.20.0.tar.bz2
 4dcaa60fbfc61636e7220a24a72bba19984a6dc752061cb40b1bd566c0e614d08927b6c223ffaaaa05636765fddacdc3113fde55d25fd09cd0c786ff44f51447  autoconfig-nvidia.patch
 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200  autoconfig-sis.patch
 b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09  fix-musl-arm.patch
-- 
cgit v1.2.3