diff options
| -rw-r--r-- | main/xorg-server/APKBUILD | 14 | ||||
| -rw-r--r-- | main/xorg-server/fix-musl-arm.patch | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 14d5d25d6..a22a82faa 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.15.2 +pkgver=1.16.0 pkgrel=0 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" @@ -175,18 +175,18 @@ xnest() { mv "$pkgdir"/usr/bin/Xnest "$subpkgdir"/usr/bin/ } -md5sums="69229fe5cdf3f20f74665d57b7601d26 xorg-server-1.15.2.tar.bz2 +md5sums="8a9ff6ee9907360f09b5bdabb8089502 xorg-server-1.16.0.tar.bz2 ea4852dedbb89550f6bc113ca66348a2 autoconfig-nvidia.patch 825ca99ea9348c66abdf2c479e0af485 autoconfig-sis.patch -ccc57d75801b716a45ce6a67f4a9f163 fix-musl-arm.patch +043cbe8fc14729ae1e776788ae7593bf fix-musl-arm.patch 6c2ce6a968b92661494fc27a6364317e 20-modules.conf" -sha256sums="3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 xorg-server-1.15.2.tar.bz2 +sha256sums="38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b xorg-server-1.16.0.tar.bz2 66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162 autoconfig-nvidia.patch 7d5d36dd152eb0fab277a4aeba0a08ad77049e591a0dea92f565a4b62f0d0a50 autoconfig-sis.patch -0cb8f7a5628037f24d05d86eed26ca0252c3ff95856367b606b64080da6db432 fix-musl-arm.patch +b210a93b4d6128c0963ade3458925ff293e1c68ac20a15964357fd401f7161e0 fix-musl-arm.patch 3c545888d585cf9931e19f85e758dd9b3bae0e9a117488f2024ab48acf67f831 20-modules.conf" -sha512sums="5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6 xorg-server-1.15.2.tar.bz2 +sha512sums="eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662 xorg-server-1.16.0.tar.bz2 4dcaa60fbfc61636e7220a24a72bba19984a6dc752061cb40b1bd566c0e614d08927b6c223ffaaaa05636765fddacdc3113fde55d25fd09cd0c786ff44f51447 autoconfig-nvidia.patch 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch -fdb45ed50e5aeac1bc8d22f1377517c52235aea7d15bb4664a774aea5c2c4fbbc9654dce6e5b3fee15ec9eadb2f87f88ca7d62a36c458df8a0dfa5b431ab225a fix-musl-arm.patch +b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch ac3e0c191c3b8fda1a78488d326b1ce01836998b6640c228b8f5f6f80be416d7534dab086bb0fbec60727c6c8afc1ef2dfd3072bf571975724943997dc7c2b73 20-modules.conf" diff --git a/main/xorg-server/fix-musl-arm.patch b/main/xorg-server/fix-musl-arm.patch index ab9075d05..e661ae175 100644 --- a/main/xorg-server/fix-musl-arm.patch +++ b/main/xorg-server/fix-musl-arm.patch @@ -1,15 +1,15 @@ ---- xorg-server-1.14.3/hw/xfree86/common/compiler.h.orig -+++ xorg-server-1.14.3/hw/xfree86/common/compiler.h -@@ -720,7 +720,7 @@ +--- ./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__)) - #ifdef __arm32__ + #if defined(__arm32__) || defined(__mips64) #define PORT_SIZE long #else -@@ -995,7 +995,7 @@ +@@ -996,7 +996,7 @@ return xf86ReadMmio32Le((void *) ioBase, port); } |