summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2017-02-15 09:29:03 +0200
committerDet2017-02-15 09:29:03 +0200
commita3f810e847286699545c757e78d2145e4a2cf9f1 (patch)
tree2fc7738ef659babe02d2cd1a673383161e7436b5
parent82f727e1a6859e0046081a398e74c63ad3652762 (diff)
downloadaur-a3f810e847286699545c757e78d2145e4a2cf9f1.tar.gz
Update nvidia conflict
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 45c150fcbfa..4dced17d92b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -83,7 +83,7 @@ pkgname = xorg-server-git
provides = xorg-server
provides = x-server
conflicts = xorg-server
- conflicts = nvidia-utils<=331.20
+ conflicts = nvidia-utils<375.26-3
conflicts = glamor-egl
conflicts = xf86-video-modesetting
replaces = glamor-egl
diff --git a/PKGBUILD b/PKGBUILD
index 0b4814b3bb4..33565b4190c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -118,7 +118,7 @@ package_xorg-server-git() {
provides+=("X-ABI-${VAR}_VERSION=$(grep -Po "${VAR}_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h |& sed 's/, /./')")
done
provides+=('xorg-server' 'x-server')
- conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
+ conflicts=('xorg-server' 'nvidia-utils<375.26-3' 'glamor-egl' 'xf86-video-modesetting')
replaces=('glamor-egl' 'xf86-video-modesetting')
install=xorg-server-git.install