From c84d539dee8793217e08047149e040dba3e5d4a5 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sat, 28 Dec 2019 07:45:17 -0600 Subject: user/xorg-server: Bump to 1.20.6 --- user/xorg-server/APKBUILD | 18 +++++++++--------- user/xorg-server/autoconfig-sis.patch | 2 +- user/xorg-server/fix-musl-arm.patch | 13 ++----------- 3 files changed, 12 insertions(+), 21 deletions(-) (limited to 'user/xorg-server') diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index 2debe9c90..de5664d60 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -1,17 +1,13 @@ # Contributor: Łukasz Jendrysik # Maintainer: A. Wilcox pkgname=xorg-server -pkgver=1.20.5 +pkgver=1.20.6 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" -# the modesetting driver is now shipped with xorg server -replaces="xf86-video-modesetting" +license="MIT" 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 @@ -23,6 +19,10 @@ makedepends="$depends_dev autoconf automake libtool util-macros xtrans openssl-dev perl zlib-dev " +# the modesetting driver is now shipped with xorg server +replaces="xf86-video-modesetting" +subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xvfb $pkgname-xephyr + $pkgname-xnest" source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 autoconfig-sis.patch fix-musl-arm.patch @@ -134,6 +134,6 @@ xwayland() { mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/ } -sha512sums="625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 xorg-server-1.20.5.tar.bz2 -30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch -b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch" +sha512sums="9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6 xorg-server-1.20.6.tar.bz2 +d77151bc51766e1230a121c008ac1d0695275bf889b1db4b3330c1f8ee720b0e046cc935fa14aaef40b02fdea508e84e53959b560131ace14ace14943c8eb734 autoconfig-sis.patch +a5f910e72ff9abd4e4a0c6806cdbe48d1b0b6cc0586f36568da5864a8dedc46a3112fe86d7a1969033f4d5b0def4dc6e5c11b656fbcc964732b417e6c9577f22 fix-musl-arm.patch" diff --git a/user/xorg-server/autoconfig-sis.patch b/user/xorg-server/autoconfig-sis.patch index e97d82114..2c1824752 100644 --- a/user/xorg-server/autoconfig-sis.patch +++ b/user/xorg-server/autoconfig-sis.patch @@ -1,6 +1,6 @@ --- ./hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 +++ ./hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1200,9 +1200,15 @@ +@@ -1231,9 +1231,15 @@ break; } break; diff --git a/user/xorg-server/fix-musl-arm.patch b/user/xorg-server/fix-musl-arm.patch index e661ae175..b5a64a4e7 100644 --- a/user/xorg-server/fix-musl-arm.patch +++ b/user/xorg-server/fix-musl-arm.patch @@ -1,7 +1,7 @@ --- ./hw/xfree86/common/compiler.h.orig +++ ./hw/xfree86/common/compiler.h -@@ -721,7 +721,7 @@ - :"r"(val), "r"(addr), "i"(ASI_PL)); +@@ -518,7 +518,7 @@ + barrier(); } -#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) @@ -9,12 +9,3 @@ #if defined(__arm32__) || defined(__mips64) #define PORT_SIZE long #else -@@ -996,7 +996,7 @@ - return xf86ReadMmio32Le((void *) ioBase, port); - } - --#elif defined(__arm__) && defined(__linux__) -+#elif defined(__arm__) && defined(__GLIBC__) - - /* for Linux on ARM, we use the LIBC inx/outx routines */ - /* note that the appropriate setup via "ioperm" needs to be done */ -- cgit v1.2.3-60-g2f50