summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD14
2 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 329c492c2bce..3342cdcf3968 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = nvidia-full-beta
pkgver = 378.13
- pkgrel = 2
+ pkgrel = 3
url = http://www.nvidia.com/
arch = i686
arch = x86_64
@@ -32,7 +32,8 @@ pkgname = nvidia-full-beta
pkgname = nvidia-utils-full-beta
pkgdesc = NVIDIA driver utilities and libraries for 'nvidia-full-beta'
install = nvidia-utils-full-beta.install
- depends = xorg-server>=1.19.1-3
+ depends = xorg-server
+ depends = mesa>=17.0.2-2
optdepends = gtk2: nvidia-settings (GTK+ v2)
optdepends = gtk3: nvidia-settings (GTK+ v3)
optdepends = opencl-nvidia-full-beta: OpenCL support
@@ -45,7 +46,6 @@ pkgname = nvidia-utils-full-beta
conflicts = nvidia-utils
conflicts = nvidia-settings
conflicts = libglvnd
- conflicts = xorg-server<1.19.1-3
backup = etc/X11/xorg.conf.d/20-nvidia.conf
pkgname = nvidia-egl-wayland-full-beta
diff --git a/PKGBUILD b/PKGBUILD
index c8596bfbef99..96eb97f80657 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ _lib32=0
pkgname=('nvidia-full-beta' 'nvidia-utils-full-beta' 'nvidia-egl-wayland-full-beta' 'nvidia-libgl-full-beta' 'opencl-nvidia-full-beta')
pkgver=378.13
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
license=('custom:NVIDIA')
@@ -162,14 +162,14 @@ package_nvidia-egl-wayland-full-beta() {
package_nvidia-utils-full-beta() {
pkgdesc="NVIDIA driver utilities and libraries for 'nvidia-full-beta'"
- depends=('xorg-server>=1.19.1-3')
+ depends=('xorg-server' 'mesa>=17.0.2-2')
optdepends=('gtk2: nvidia-settings (GTK+ v2)'
'gtk3: nvidia-settings (GTK+ v3)'
'opencl-nvidia-full-beta: OpenCL support'
'xorg-server-devel: nvidia-xconfig'
'egl-wayland-git: for alternative, more advanced Wayland library (libnvidia-egl-wayland.so.1.0.1)')
provides=("nvidia-utils=$pkgver" "nvidia-settings=$pkgver" 'libglvnd' 'vulkan-driver')
- conflicts=('nvidia-utils' 'nvidia-settings' 'libglvnd' 'xorg-server<1.19.1-3')
+ conflicts=('nvidia-utils' 'nvidia-settings' 'libglvnd')
backup=('etc/X11/xorg.conf.d/20-nvidia.conf')
install=$pkgname.install
cd $_pkg
@@ -191,7 +191,8 @@ package_nvidia-utils-full-beta() {
# GLX
install -Dm755 libGLX.so.0 "$pkgdir"/usr/lib/libGLX.so.0
install -Dm755 libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib/libGLX_nvidia.so.$pkgver
- ln -s libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib/libGLX_indirect.so.0
+ # now in mesa driver
+ #ln -s libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib/libGLX_indirect.so.0
# EGL
install -Dm755 libEGL.so.1 "$pkgdir"/usr/lib/nvidia/libEGL.so.1
@@ -411,7 +412,7 @@ package_lib32-nvidia-libgl-full-beta() {
package_lib32-nvidia-utils-full-beta() {
pkgdesc="NVIDIA driver utilities and libraries for 'nvidia-full-beta' (32-bit)"
- depends=('lib32-zlib' 'lib32-gcc-libs' 'nvidia-utils-full-beta')
+ depends=('lib32-zlib' 'lib32-gcc-libs' 'nvidia-utils-full-beta' 'lib32-mesa>=17.0.2-1')
optdepends=('lib32-opencl-nvidia-full-beta: OpenCL support')
provides=("lib32-nvidia-utils=$pkgver" 'lib32-libglvnd' 'lib32-vulkan-driver')
conflicts=('lib32-nvidia-utils' 'lib32-libglvnd')
@@ -426,7 +427,8 @@ package_lib32-nvidia-utils-full-beta() {
# GLX
install -Dm755 32/libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so.0
install -Dm755 32/libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libGLX_nvidia.so.$pkgver
- ln -s libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libGLX_indirect.so.0
+ # now in lib32-mesa driver
+ #ln -s libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libGLX_indirect.so.0
# EGL
install -Dm755 32/libEGL.so.1 "$pkgdir"/usr/lib32/nvidia/libEGL.so.1