aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2019-03-01 14:19:11 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2019-03-07 21:42:23 +0000
commit785ba5ee3bef5a8907fd0fb778baac73fd7855ac (patch)
tree96cd54a75a47f6bc6394c271df2bff973d4b3c67
parent8ddd777f9f57e92cac6f648e53313764bf4dc206 (diff)
downloadaports-785ba5ee3bef5a8907fd0fb778baac73fd7855ac.tar.bz2
aports-785ba5ee3bef5a8907fd0fb778baac73fd7855ac.tar.xz
main/xorg-server: upgrade to 1.20.4
-rw-r--r--main/xorg-server/APKBUILD8
-rw-r--r--main/xorg-server/autoconfig-nvidia.patch7
2 files changed, 7 insertions, 8 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index 767e58f190..9b405c3b6f 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Ɓukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xorg-server
-pkgver=1.20.3
-pkgrel=1
+pkgver=1.20.4
+pkgrel=0
pkgdesc="X.Org X servers"
url="http://xorg.freedesktop.org"
arch="all"
@@ -181,8 +181,8 @@ xwayland() {
mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/
}
-sha512sums="ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba xorg-server-1.20.3.tar.bz2
-4dcaa60fbfc61636e7220a24a72bba19984a6dc752061cb40b1bd566c0e614d08927b6c223ffaaaa05636765fddacdc3113fde55d25fd09cd0c786ff44f51447 autoconfig-nvidia.patch
+sha512sums="f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8 xorg-server-1.20.4.tar.bz2
+016d10e59681d36be19aacc1505103bd340a5e81855e551997b42f8b54796be46fb2d91be8d1aa3bebb10d34e51258be9de1299c2e351b840450de38ff103df0 autoconfig-nvidia.patch
30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch
b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch
95036f2452732cc31f6b646da9f46b7be30f4c9392724386b02f67fece1f506b00e15d14cbd8cf0ce75ca1fd144b4bea7e59288d4aaf4d6c1e06e5168931eb67 20-modules.conf"
diff --git a/main/xorg-server/autoconfig-nvidia.patch b/main/xorg-server/autoconfig-nvidia.patch
index 6d5220ac7a..d15d36dafb 100644
--- a/main/xorg-server/autoconfig-nvidia.patch
+++ b/main/xorg-server/autoconfig-nvidia.patch
@@ -1,10 +1,9 @@
-diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000
-+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
@@ -1144,7 +1144,23 @@
int idx = 0;
- #ifdef __linux__
+ #if defined(__linux__) || defined(__NetBSD__)
- driverList[idx++] = "nouveau";
+ switch (dev->device_id)
+ {