aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2019-11-23 13:10:04 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2019-11-23 14:11:36 +0100
commite0769baec3f4b4875041572838e75cbca03a7b45 (patch)
tree50ceeddf09f99c092e4dc3f6a3e324c15ec5f0f5
parentcfc3b93849813e8404c65b56890f4ef9a2dcdada (diff)
downloadaports-e0769baec3f4b4875041572838e75cbca03a7b45.tar.bz2
aports-e0769baec3f4b4875041572838e75cbca03a7b45.tar.xz
main/xorg-server: upgrade to 1.20.6
-rw-r--r--main/xorg-server/APKBUILD8
-rw-r--r--main/xorg-server/fix-musl-arm.patch20
2 files changed, 3 insertions, 25 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index 635f7cb655..813d4904d3 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/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.5
+pkgver=1.20.6
pkgrel=0
pkgdesc="X.Org X servers"
url="https://www.x.org/wiki"
@@ -58,7 +58,6 @@ makedepends="
source="https://www.x.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2
autoconfig-nvidia.patch
autoconfig-sis.patch
- fix-musl-arm.patch
"
# secfixes:
@@ -167,7 +166,6 @@ xwayland() {
mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/
}
-sha512sums="625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 xorg-server-1.20.5.tar.bz2
+sha512sums="9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6 xorg-server-1.20.6.tar.bz2
016d10e59681d36be19aacc1505103bd340a5e81855e551997b42f8b54796be46fb2d91be8d1aa3bebb10d34e51258be9de1299c2e351b840450de38ff103df0 autoconfig-nvidia.patch
-30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch
-b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch"
+30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch"
diff --git a/main/xorg-server/fix-musl-arm.patch b/main/xorg-server/fix-musl-arm.patch
deleted file mode 100644
index e661ae1758..0000000000
--- a/main/xorg-server/fix-musl-arm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./hw/xfree86/common/compiler.h.orig
-+++ ./hw/xfree86/common/compiler.h
-@@ -721,7 +721,7 @@
- :"r"(val), "r"(addr), "i"(ASI_PL));
- }
-
--#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
-+#elif defined(__mips__) || (defined(__arm32__) && !defined(__GLIBC__))
- #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 */