nvidia-32: converted to GLVND

3 files changed, 99 insertions, 50 deletions

diff --git a/nvidia-32/.footprint b/nvidia-32/.footprint
index f6e9b6f6..f4b4f93f 100644
--- a/nvidia-32/.footprint
+++ b/nvidia-32/.footprint
@@ -1,28 +1,48 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
--rwxr-xr-x	root/root	usr/lib32/libGL.so.390.77
-lrwxrwxrwx	root/root	usr/lib32/libGL_so_1_2_nvidia -> libGL.so.390.77
-lrwxrwxrwx	root/root	usr/lib32/libOpenCL.so -> libOpenCL.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib32/libEGL_nvidia.so.0 -> libEGL_nvidia.so.
+-rwxr-xr-x	root/root	usr/lib32/libEGL_nvidia.so.390.77
+lrwxrwxrwx	root/root	usr/lib32/libGLESv1_CM_nvidia.so.1 -> libGLESv1_CM_nvidia.so.390.77
+-rwxr-xr-x	root/root	usr/lib32/libGLESv1_CM_nvidia.so.390.77
+lrwxrwxrwx	root/root	usr/lib32/libGLESv2_nvidia.so.2 -> libGLESv2_nvidia.so.390.77
+-rwxr-xr-x	root/root	usr/lib32/libGLESv2_nvidia.so.390.77
+lrwxrwxrwx	root/root	usr/lib32/libGLX_nvidia.so.0 -> libGLX_nvidia.so.390.77
+-rwxr-xr-x	root/root	usr/lib32/libGLX_nvidia.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libOpenCL.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib32/libcuda.so -> libcuda.so.390.77
+lrwxrwxrwx	root/root	usr/lib32/libcuda.so.1 -> libcuda.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libcuda.so.390.77
-lrwxrwxrwx	root/root	usr/lib32/libnvcuvid.so -> libnvcuvid.so.390.77
-lrwxrwxrwx	root/root	usr/lib32/libnvcuvid.so.1 -> libnvcuvid.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libnvcuvid.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libnvidia-cfg.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libnvidia-compiler.so.390.77
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-eglcore.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libnvidia-encode.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libnvidia-fatbinaryloader.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libnvidia-fbc.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libnvidia-glcore.so.390.77
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-glsi.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libnvidia-ifr.so.390.77
-lrwxrwxrwx	root/root	usr/lib32/libnvidia-ml.so -> libnvidia-ml.so.390.77
-lrwxrwxrwx	root/root	usr/lib32/libnvidia-ml.so.1 -> libnvidia-ml.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libnvidia-ml.so.390.77
+lrwxrwxrwx	root/root	usr/lib32/libnvidia-opencl.so -> libnvidia-opencl.so.390.77
+lrwxrwxrwx	root/root	usr/lib32/libnvidia-opencl.so.1 -> libnvidia-opencl.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libnvidia-opencl.so.390.77
+lrwxrwxrwx	root/root	usr/lib32/libnvidia-ptxjitcompiler.so -> libnvidia-ptxjitcompiler.so.390.77
+lrwxrwxrwx	root/root	usr/lib32/libnvidia-ptxjitcompiler.so.1 -> libnvidia-ptxjitcompiler.so.390.77
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-ptxjitcompiler.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/libnvidia-tls.so.390.77
+drwxr-xr-x	root/root	usr/lib32/nvidia/
+drwxr-xr-x	root/root	usr/lib32/nvidia/xorg/
+lrwxrwxrwx	root/root	usr/lib32/nvidia/xorg/libglx.so -> libglx.so.390.77
+lrwxrwxrwx	root/root	usr/lib32/nvidia/xorg/libglx.so.1 -> libglx.so.390.77
+-rwxr-xr-x	root/root	usr/lib32/nvidia/xorg/libglx.so.390.77
 drwxr-xr-x	root/root	usr/lib32/tls/
 -rwxr-xr-x	root/root	usr/lib32/tls/libnvidia-tls.so.390.77
 drwxr-xr-x	root/root	usr/lib32/vdpau/
 lrwxrwxrwx	root/root	usr/lib32/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.390.77
 lrwxrwxrwx	root/root	usr/lib32/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.390.77
 -rwxr-xr-x	root/root	usr/lib32/vdpau/libvdpau_nvidia.so.390.77
+drwxr-xr-x	root/root	usr/lib32/xorg/
+drwxr-xr-x	root/root	usr/lib32/xorg/modules/
+drwxr-xr-x	root/root	usr/lib32/xorg/modules/drivers/
+-rwxr-xr-x	root/root	usr/lib32/xorg/modules/drivers/nvidia_drv.so
+drwxr-xr-x	root/root	usr/lib32/xorg/modules/extensions/
diff --git a/nvidia-32/.signature b/nvidia-32/.signature
index 32e5a91e..f49d62ea 100644
--- a/nvidia-32/.signature
+++ b/nvidia-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXf3vEA/KUFHmtsj4gAcpmxCbx4kq/MkMmpwnYiVvy9nEIpytliO9p/1u5uampB78C612kvRdw1p+zZ3E0av2hw0=
-SHA256 (Pkgfile) = dfb2d1674c3daae1acf0db0e043be2cec4ab6167054b87c4382b301c9202e3e9
-SHA256 (.footprint) = 1930f042b321da6a85abb6719eed193d0fd6a96a79c6ef841e3e8799d813dbda
+RWSwxGo/zH7eXVkC6rWEDeG2SNA5IKd1Mvgb3SYDr7A+rXEfc01jRZ3SizcRU7rsLu1mJ/Rn1T/flqj7QUGE+rZ68vyCAdqedAc=
+SHA256 (Pkgfile) = 1333a0b0d956f4df9f08c1a8900ab226baa40d7547fc4758b97755eb5fc4685b
+SHA256 (.footprint) = 11178b11431824ed23f68c953456b145b7549fd3471dc2af8e026ff290977cfc
 SHA256 (NVIDIA-Linux-x86-390.77.run) = 1445d22b987daca15bf313b39d08aca4cec71dd473f1d20eb00b0b08df08a3f9
diff --git a/nvidia-32/Pkgfile b/nvidia-32/Pkgfile
index 6da1c4d9..6cff51ca 100644
--- a/nvidia-32/Pkgfile
+++ b/nvidia-32/Pkgfile
@@ -1,49 +1,78 @@
-# Description: nVIDIA Linux Display Driver (long lived branch version)
+# Description: NVIDIA Linux Display Driver (long lived branch)
 # URL: http://www.nvidia.com/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: nvidia xorg-libxvmc-32
+# Depends on: libglvnd-32
 
 name=nvidia-32
 version=390.77
-release=1
+release=2
 source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version.run)
 
 build() {
-    sh NVIDIA-Linux-x86-$version.run --extract-only
-    cd NVIDIA-Linux-x86-$version
-
-    # libraries
-    install -d $PKG/usr/lib32/{tls,vdpau}
-    install -m 0755 libGL.so.$version              $PKG/usr/lib32
-    install -m 0755 libOpenCL.so.1.0.0             $PKG/usr/lib32
-    install -m 0755 libcuda.so.$version            $PKG/usr/lib32
-    install -m 0755 libnvidia-cfg.so.$version      $PKG/usr/lib32
-    install -m 0755 libnvidia-compiler.so.$version $PKG/usr/lib32
-    install -m 0755 libnvidia-encode.so.$version   $PKG/usr/lib32
-    install -m 0755 libnvidia-fbc.so.$version      $PKG/usr/lib32
-    install -m 0755 libnvidia-glcore.so.$version   $PKG/usr/lib32
-    install -m 0755 libnvidia-ifr.so.$version      $PKG/usr/lib32
-    install -m 0755 libnvidia-ml.so.$version       $PKG/usr/lib32
-    install -m 0755 libnvidia-opencl.so.$version   $PKG/usr/lib32
-    install -m 0755 libnvidia-tls.so.$version      $PKG/usr/lib32
-    install -m 0755 libnvcuvid.so.$version         $PKG/usr/lib32
-    install -m 0755 tls/libnvidia-tls.so.$version  $PKG/usr/lib32/tls
-    install -m 0755 libvdpau_nvidia.so.$version    $PKG/usr/lib32/vdpau
-    install -m 0755 libnvidia-fatbinaryloader.so.$version $PKG/usr/lib32
-
-    ln -s libvdpau_nvidia.so.$version $PKG/usr/lib32/vdpau/libvdpau_nvidia.so.1
-    ln -s libvdpau_nvidia.so.$version $PKG/usr/lib32/vdpau/libvdpau_nvidia.so
-
-    ln -s libnvcuvid.so.$version $PKG/usr/lib32/libnvcuvid.so.1
-    ln -s libnvcuvid.so.$version $PKG/usr/lib32/libnvcuvid.so
-
-    ln -s libnvidia-ml.so.$version $PKG/usr/lib32/libnvidia-ml.so.1
-    ln -s libnvidia-ml.so.$version $PKG/usr/lib32/libnvidia-ml.so
-
-    ln -s libOpenCL.so.1.0.0 $PKG/usr/lib32/libOpenCL.so
-
-    # additional symlinks required by gl-select
-    ln -s libGL.so.$version $PKG/usr/lib32/libGL_so_1_2_nvidia
-
-    rm -rf $PKG/usr/{man,share} $PKG/lib
+	sh NVIDIA-Linux-x86-$version.run --extract-only
+	cd NVIDIA-Linux-x86-$version
+
+	# X driver and GLX extension
+	install -d $PKG/usr/lib32/xorg/modules/{drivers,extensions}
+	install -m 0755 nvidia_drv.so $PKG/usr/lib32/xorg/modules/drivers/
+	install -d -m 0755 $PKG/usr/lib32/nvidia/xorg
+	install -m 0755 libglx.so.$version $PKG/usr/lib32/nvidia/xorg/
+	ln -s libglx.so.$version $PKG/usr/lib32/nvidia/xorg/libglx.so
+	ln -s libglx.so.$version $PKG/usr/lib32/nvidia/xorg/libglx.so.1
+
+	# EGL and OpenGL ES libraries and config
+	install -m 0755 libGLESv1_CM_nvidia.so.$version $PKG/usr/lib32/
+	ln -s libGLESv1_CM_nvidia.so.$version $PKG/usr/lib32/libGLESv1_CM_nvidia.so.1
+	install -m 0755 libGLESv2_nvidia.so.$version $PKG/usr/lib32/
+	ln -s libGLESv2_nvidia.so.$version $PKG/usr/lib32/libGLESv2_nvidia.so.2
+
+	# wayland EGL library
+	#install -m 0755 libnvidia-egl-wayland.so.1.0.2 $PKG/usr/lib32/
+
+	# GLVND vendor implementation libraries
+	install -m 0755 libGLX_nvidia.so.$version $PKG/usr/lib32/
+	ln -s libGLX_nvidia.so.$version $PKG/usr/lib32/libGLX_nvidia.so.0
+	install -m 0755 libEGL_nvidia.so.$version $PKG/usr/lib32/
+	ln -s libEGL_nvidia.so.$verison $PKG/usr/lib32/libEGL_nvidia.so.0
+
+	# driver component libraries
+	install -m 0755 libnvidia-cfg.so.$version $PKG/usr/lib32/
+	install -m 0755 libnvidia-compiler.so.$version $PKG/usr/lib32/
+	install -m 0755 libnvidia-eglcore.so.$version $PKG/usr/lib32/
+	install -m 0755 libnvidia-glcore.so.$version $PKG/usr/lib32/
+	install -m 0755 libnvidia-glsi.so.$version $PKG/usr/lib32/
+
+	# vendor VDPAU library
+	install -D -m 0755 libvdpau_nvidia.so.$version $PKG/usr/lib32/vdpau/libvdpau_nvidia.so.$version
+	ln -s libvdpau_nvidia.so.$version $PKG/usr/lib32/vdpau/libvdpau_nvidia.so.1
+	ln -s libvdpau_nvidia.so.$version $PKG/usr/lib32/vdpau/libvdpau_nvidia.so
+
+	# CUDA libraries
+	install -m 0755 libcuda.so.$version $PKG/usr/lib32/
+	ln -s libcuda.so.$version $PKG/usr/lib32/libcuda.so.1
+	ln -s libcuda.so.$version $PKG/usr/lib32/libcuda.so
+	install -m 0755 libnvidia-fatbinaryloader.so.$version $PKG/usr/lib32/
+	install -m 0755 libnvidia-ptxjitcompiler.so.$version $PKG/usr/lib32/
+	ln -s libnvidia-ptxjitcompiler.so.$version $PKG/usr/lib32/libnvidia-ptxjitcompiler.so.1
+	ln -s libnvidia-ptxjitcompiler.so.$version $PKG/usr/lib32/libnvidia-ptxjitcompiler.so
+
+	# OpenCL libraries and config
+	install -m 0755 libOpenCL.so.1.0.0 $PKG/usr/lib32/
+	install -m 0755 libnvidia-opencl.so.$version $PKG/usr/lib32/
+	ln -s libnvidia-opencl.so.$version $PKG/usr/lib32/libnvidia-opencl.so.1
+	ln -s libnvidia-opencl.so.$version $PKG/usr/lib32/libnvidia-opencl.so
+
+	# TLS libraries
+	install -m 0755 libnvidia-tls.so.$version $PKG/usr/lib32/
+	install -d $PKG/usr/lib32/tls
+	install -m 0755 tls/libnvidia-tls.so.$version $PKG/usr/lib32/tls/
+
+	# monitoring and management API library
+	install -m 0755 libnvidia-ml.so.$version $PKG/usr/lib32/
+
+	# encoding/decoding libraries
+	install -m 0755 libnvcuvid.so.$version $PKG/usr/lib32/
+	install -m 0755 libnvidia-encode.so.$version $PKG/usr/lib32/
+	install -m 0755 libnvidia-ifr.so.$version $PKG/usr/lib32/
+	install -m 0755 libnvidia-fbc.so.$version $PKG/usr/lib32/
 }