summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO28
-rw-r--r--PKGBUILD40
2 files changed, 28 insertions, 40 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 62252f32e7c5..fc43f078fee5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Wed Feb 10 11:36:07 UTC 2016
pkgbase = nvidia-full-beta
pkgver = 361.28
pkgrel = 1
@@ -55,29 +57,3 @@ pkgname = opencl-nvidia-full-beta
provides = opencl-nvidia
conflicts = opencl-nvidia
-pkgname = lib32-nvidia-utils-full-beta
- pkgdesc = NVIDIA driver utilities and libraries for 'nvidia-full-beta' (32-bit)
- depends = lib32-zlib
- depends = lib32-gcc-libs
- optdepends = lib32-opencl-nvidia-full-beta: OpenCL support
- provides = lib32-nvidia-utils=361.28
- conflicts = lib32-nvidia-utils
-
-pkgname = lib32-nvidia-libgl-full-beta
- pkgdesc = NVIDIA driver library symlinks for 'lib32-nvidia-utils-full-beta'
- depends = lib32-nvidia-utils-full-beta
- provides = lib32-libgl
- provides = lib32-nvidia-libgl
- conflicts = lib32-libgl
- conflicts = lib32-nvidia-libgl
- conflicts = lib32-mesa<10.1.0-2
-
-pkgname = lib32-opencl-nvidia-full-beta
- pkgdesc = NVIDIA's OpenCL implemention for 'lib32-nvidia-utils-full-beta'
- depends = lib32-libcl
- depends = lib32-zlib
- depends = lib32-gcc-libs
- optdepends = opencl-headers: headers necessary for OpenCL development
- provides = lib32-opencl-nvidia
- conflicts = lib32-opencl-nvidia
-
diff --git a/PKGBUILD b/PKGBUILD
index b6d32123b036..f44e92539a83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -126,10 +126,10 @@ package_nvidia-libgl-full-beta() {
ln -s libglx.so.$pkgver "$pkgdir"/usr/lib/xorg/modules/extensions/libglx.so.1
ln -s libglx.so.$pkgver "$pkgdir"/usr/lib/xorg/modules/extensions/libglx.so
- # OpenGL (link)
- ln -s /usr/lib/nvidia/libGL.so.1.0.0 "$pkgdir"/usr/lib/libGL.so.1.0.0
- ln -s libGL.so.1.0.0 "$pkgdir"/usr/lib/libGL.so.1
- ln -s libGL.so.1.0.0 "$pkgdir"/usr/lib/libGL.so
+ # libGL (link)
+ ln -s /usr/lib/nvidia/libGL.so.$pkgver "$pkgdir"/usr/lib/libGL.so.$pkgver
+ ln -s libGL.so.$pkgver "$pkgdir"/usr/lib/libGL.so.1
+ ln -s libGL.so.$pkgver "$pkgdir"/usr/lib/libGL.so
# GLX (link)
ln -s /usr/lib/nvidia/libGLX.so.0 "$pkgdir"/usr/lib/libGLX.so.0
@@ -152,6 +152,9 @@ package_nvidia-libgl-full-beta() {
ln -s libGLESv2.so.2 "$pkgdir"/usr/lib/libGLESv2.so.$pkgver
ln -s libGLESv2.so.2 "$pkgdir"/usr/lib/libGLESv2.so
+ # VDPAU (link)
+ ln -s /usr/lib/vdpau/libvdpau_nvidia.so.$pkgver "$pkgdir"/usr/lib/libvdpau_nvidia.so
+
# License (link)
install -d "$pkgdir"/usr/share/licenses/
ln -s nvidia/ "$pkgdir"/usr/share/licenses/nvidia-libgl
@@ -177,8 +180,8 @@ package_nvidia-utils-full-beta() {
install -Dm755 libglx.so.$pkgver "$pkgdir"/usr/lib/nvidia/xorg/modules/extensions/libglx.so.$pkgver
ln -s libglx.so.$pkgver "$pkgdir"/usr/lib/nvidia/xorg/modules/extensions/libglx.so
- # OpenGL
- install -Dm755 libGL.so.1.0.0 "$pkgdir"/usr/lib/nvidia/libGL.so.1.0.0
+ # libGL & OpenGL
+ install -Dm755 libGL.so.$pkgver "$pkgdir"/usr/lib/nvidia/libGL.so.$pkgver
install -Dm755 libGLdispatch.so.0 "$pkgdir"/usr/lib/libGLdispatch.so.0
install -Dm755 libnvidia-glcore.so.$pkgver "$pkgdir"/usr/lib/libnvidia-glcore.so.$pkgver
install -Dm755 libOpenGL.so.0 "$pkgdir"/usr/lib/libOpenGL.so.0
@@ -223,7 +226,8 @@ package_nvidia-utils-full-beta() {
install -Dm755 libnvidia-fatbinaryloader.so.$pkgver "$pkgdir"/usr/lib/libnvidia-fatbinaryloader.so.$pkgver
# TLS (Thread local storage) support for OpenGL libs
- install -Dm755 tls/libnvidia-tls.so.$pkgver "$pkgdir"/usr/lib/libnvidia-tls.so.$pkgver
+ install -Dm755 libnvidia-tls.so.$pkgver "$pkgdir"/usr/lib/libnvidia-tls.so.$pkgver # Classic
+ install -Dm755 tls/libnvidia-tls.so.$pkgver "$pkgdir"/usr/lib/tls/libnvidia-tls.so.$pkgver # New
# GPU monitoring and management (1/2)
install -Dm755 libnvidia-ml.so.$pkgver "$pkgdir"/usr/lib/libnvidia-ml.so.$pkgver
@@ -372,11 +376,11 @@ package_lib32-nvidia-libgl-full-beta() {
conflicts=('lib32-libgl' 'lib32-nvidia-libgl' 'lib32-mesa<10.1.0-2')
cd $_pkg
- # OpenGL (link)
+ # 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
+ ln -s /usr/lib32/nvidia/libGL.so.$pkgver "$pkgdir"/usr/lib32/libGL.so.$pkgver
+ ln -s libGL.so.$pkgver "$pkgdir"/usr/lib32/libGL.so.1
+ ln -s libGL.so.$pkgver "$pkgdir"/usr/lib32/libGL.so
# GLX (link)
ln -s /usr/lib32/nvidia/libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so.0
@@ -398,6 +402,13 @@ package_lib32-nvidia-libgl-full-beta() {
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
}
package_lib32-nvidia-utils-full-beta() {
@@ -408,8 +419,8 @@ package_lib32-nvidia-utils-full-beta() {
conflicts=('lib32-nvidia-utils')
cd $_pkg
- # OpenGL
- install -Dm755 32/libGL.so.1.0.0 "$pkgdir"/usr/lib32/nvidia/libGL.so.1.0.0
+ # libGL & OpenGL
+ install -Dm755 32/libGL.so.$pkgver "$pkgdir"/usr/lib32/nvidia/libGL.so.$pkgver
install -Dm755 32/libGLdispatch.so.0 "$pkgdir"/usr/lib32/libGLdispatch.so.0
install -Dm755 32/libnvidia-glcore.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-glcore.so.$pkgver
install -Dm755 32/libOpenGL.so.0 "$pkgdir"/usr/lib32/libOpenGL.so.0
@@ -447,7 +458,8 @@ package_lib32-nvidia-utils-full-beta() {
install -Dm755 32/libnvidia-fatbinaryloader.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-fatbinaryloader.so.$pkgver
# TLS (Thread local storage) support for OpenGL libs
- install -Dm755 32/tls/libnvidia-tls.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-tls.so.$pkgver
+ install -Dm755 32/libnvidia-tls.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-tls.so.$pkgver # Classic
+ install -Dm755 32/tls/libnvidia-tls.so.$pkgver "$pkgdir"/usr/lib32/tls/libnvidia-tls.so.$pkgver # New
# GPU monitoring and management
install -Dm755 32/libnvidia-ml.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-ml.so.$pkgver