summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2017-03-26 12:08:32 +0300
committerDet2017-03-26 12:08:32 +0300
commit631a16e6d76ac42142c9525cf4ffe6c2ed4b832d (patch)
tree314dd2800267655ad87a52007e96ed53966fa7bf
parentdf30426b77bb7fd8f7acc9d6be7f1977d25c083a (diff)
downloadaur-631a16e6d76ac42142c9525cf4ffe6c2ed4b832d.tar.gz
Fix conflict with latest mesa + pkgrel
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD7
2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2d3b5da6ae5..9bb1dd960c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lib32-nvidia-utils-beta
pkgver = 378.13
- pkgrel = 2
+ pkgrel = 3
url = http://www.nvidia.com/
arch = x86_64
license = custom:NVIDIA
@@ -14,6 +14,7 @@ pkgname = lib32-nvidia-utils-beta
depends = lib32-zlib
depends = lib32-gcc-libs
depends = nvidia-utils-beta
+ depends = lib32-mesa>=17.0.2-1
optdepends = lib32-opencl-nvidia-beta: OpenCL support
provides = lib32-nvidia-utils=378.13
provides = lib32-libglvnd
diff --git a/PKGBUILD b/PKGBUILD
index 7972bbe62f4..db8b1c2b9e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=('lib32-nvidia-utils-beta' 'lib32-nvidia-libgl-beta' 'lib32-opencl-nvidia-beta')
pkgver=378.13
-pkgrel=2
+pkgrel=3
arch=('x86_64')
url="http://www.nvidia.com/"
makedepends=('nvidia-libgl-beta') # To avoid conflict during installation in the build chroot
@@ -91,7 +91,7 @@ package_lib32-nvidia-libgl-beta() {
package_lib32-nvidia-utils-beta() {
pkgdesc="NVIDIA driver utilities and libraries (beta version) (32-bit)"
- depends=('lib32-zlib' 'lib32-gcc-libs' 'nvidia-utils-beta')
+ depends=('lib32-zlib' 'lib32-gcc-libs' 'nvidia-utils-beta' 'lib32-mesa>=17.0.2-1')
optdepends=('lib32-opencl-nvidia-beta: OpenCL support')
provides=("lib32-nvidia-utils=$pkgver" 'lib32-libglvnd' 'lib32-vulkan-driver')
conflicts=('lib32-nvidia-utils' 'lib32-libglvnd')
@@ -106,7 +106,8 @@ package_lib32-nvidia-utils-beta() {
# GLX
install -Dm755 libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so.0
install -Dm755 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 libEGL.so.1 "$pkgdir"/usr/lib32/nvidia/libEGL.so.1