summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2017-02-16 14:02:12 +0200
committerDet2017-02-16 14:02:12 +0200
commitad54003fe19f3c9aa94f03156872b4b3339a6528 (patch)
treedcc17ac88df47f62eef206f3638c2857fb7b4823
parent81a9e12ea937c83937429ee1c6e3ecca8f513bea (diff)
downloadaur-ad54003fe19f3c9aa94f03156872b4b3339a6528.tar.gz
Fixes
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD26
2 files changed, 9 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 53416772e65..c1b8a8f4334 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -25,7 +25,7 @@ pkgname = lib32-nvidia-libgl-beta
pkgdesc = NVIDIA driver library symlinks for 'lib32-nvidia-utils-beta'
depends = lib32-nvidia-utils-beta
depends = nvidia-libgl-beta
- provides = lib32-nvidia-libgl
+ provides = lib32-nvidia-libgl=378.13
provides = lib32-libgl
provides = lib32-libegl
provides = lib32-libgles
@@ -40,7 +40,7 @@ pkgname = lib32-opencl-nvidia-beta
depends = lib32-zlib
depends = lib32-gcc-libs
optdepends = opencl-headers: headers necessary for OpenCL development
- provides = lib32-opencl-nvidia
+ provides = lib32-opencl-nvidia=378.13
provides = lib32-opencl-driver
conflicts = lib32-opencl-nvidia
diff --git a/PKGBUILD b/PKGBUILD
index ec5d812c6bc..ceea2f62d38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -42,7 +42,7 @@ package_lib32-opencl-nvidia-beta() {
pkgdesc="NVIDIA's OpenCL implemention for 'lib32-nvidia-utils-beta' "
depends=('lib32-zlib' 'lib32-gcc-libs')
optdepends=('opencl-headers: headers necessary for OpenCL development')
- provides=('lib32-opencl-nvidia' 'lib32-opencl-driver')
+ provides=("lib32-opencl-nvidia=$pkgver" 'lib32-opencl-driver')
conflicts=('lib32-opencl-nvidia')
cd $_pkg
@@ -61,42 +61,29 @@ package_lib32-opencl-nvidia-beta() {
package_lib32-nvidia-libgl-beta() {
pkgdesc="NVIDIA driver library symlinks for 'lib32-nvidia-utils-beta'"
depends=('lib32-nvidia-utils-beta' 'nvidia-libgl-beta')
- provides=('lib32-nvidia-libgl' 'lib32-libgl' 'lib32-libegl' 'lib32-libgles')
+ provides=("lib32-nvidia-libgl=$pkgver" 'lib32-libgl' 'lib32-libegl' 'lib32-libgles')
conflicts=('lib32-nvidia-libgl' 'lib32-libgl' 'lib32-libegl' 'lib32-libgles')
replaces=('lib32-nvidia-utils<=313.26-1')
cd $_pkg
+ mkdir -p "${pkgdir}/usr/lib/"
+
# libGL (link)
- install -d "$pkgdir"/usr/lib32/
- ln -s /usr/lib32/nvidia/libGL.so.1.0.0 "$pkgdir"/usr/lib32/libGL.so.1.0.0
- ln -s libGL.so.1.0.0 "$pkgdir"/usr/lib32/libGL.so.1
- ln -s libGL.so.1.0.0 "$pkgdir"/usr/lib32/libGL.so
-
- # GLX (link)
- ln -s /usr/lib32/nvidia/libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so.0
- ln -s libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so.$pkgver
- ln -s libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so
- ln -s libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libGLX_indirect.so.0
+ ln -s /usr/lib32/nvidia/libGL.so.1.0.0 "$pkgdir"/usr/lib32/libGL.so.1
+ ln -s libGL.so.1 "$pkgdir"/usr/lib32/libGL.so
# EGL (link)
ln -s /usr/lib32/nvidia/libEGL.so.1 "$pkgdir"/usr/lib32/libEGL.so.1
- ln -s libEGL.so.1 "$pkgdir"/usr/lib32/libEGL.so.$pkgver
ln -s libEGL.so.1 "$pkgdir"/usr/lib32/libEGL.so
- ln -s libnvidia-egl-wayland.so.1.0.1 "$pkgdir"/usr/lib32/libnvidia-egl-wayland.so.1
# OpenGL ES 1 (link)
ln -s /usr/lib32/nvidia/libGLESv1_CM.so.1 "$pkgdir"/usr/lib32/libGLESv1_CM.so.1
- ln -s libGLESv1_CM.so.1 "$pkgdir"/usr/lib32/libGLESv1_CM.so.$pkgver
ln -s libGLESv1_CM.so.1 "$pkgdir"/usr/lib32/libGLESv1_CM.so
# OpenGL ES 2 (link)
ln -s /usr/lib32/nvidia/libGLESv2.so.2 "$pkgdir"/usr/lib32/libGLESv2.so.2
- ln -s libGLESv2.so.2 "$pkgdir"/usr/lib32/libGLESv2.so.$pkgver
ln -s libGLESv2.so.2 "$pkgdir"/usr/lib32/libGLESv2.so
- # VDPAU (link)
- ln -s /usr/lib32/vdpau/libvdpau_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libvdpau_nvidia.so
-
# License (link)
install -d "$pkgdir"/usr/share/licenses/
ln -s nvidia-utils/ "$pkgdir"/usr/share/licenses/lib32-nvidia-libgl
@@ -119,6 +106,7 @@ package_lib32-nvidia-utils-beta() {
# GLX
install -Dm755 libGLX.so.0 "$pkgdir"/usr/lib32/nvidia/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
# EGL
install -Dm755 libEGL.so.1 "$pkgdir"/usr/lib32/nvidia/libEGL.so.1