Attached is a diff against 14.2 master (based on about 15:00 pm PST USA) for the newest nvidia binary driver 361.28, or you can get the files here:
(fast) http://www.koenigcomputers.com/sbo-testing/ (slow) http://www.linuxgalaxy.org/files/sbo-testing/ archive tarballs are in the (slow) link. So far, works on 14.2beta, but there might be a few issues due to the new GLVND libs. I tried to maintain maximum compatibility but may have misplaced/mislinked a few libs. This script is starting to get tedious. Hopefully when libglvnd ( https://github.com/NVIDIA/libglvnd ) is completed, I can simplify it a bit. As always, patch away on any bugs. -Ed
diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index 05700b6..a309df1 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -43,3 +43,10 @@ may fail, resulting in xorg not working. Here are the affected files:
/usr/lib[64]/libGL.so.1.2
/usr/lib[64]/xorg/modules/extensions/{libglx.so libglx.la}
Simply remove the dead nvidia symlinks and rename the saved '-xorg' appended files.
+
+NOTE:
+This package installs the non-GLVND drivers and some of the new GLVND drivers included
+for EGL support. Only one version of libGL and libGLX can exist until X and Mesa support
+GLNVD (GL Vendor Neutral Dispatch).
+https://devtalk.nvidia.com/default/topic/915640/unix-graphics-announcements-and-news/multiple-glx-client-libraries-in-the-nvidia-linux-driver-installer-package/
+
diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index 1583469..ca9b8d1 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -23,3 +23,4 @@
4.2 28-JUL-2015 version update LLB, bug fixes, clean-ups.
4.3 05-SEP-2015 version update LLB
4.4 13-DEC-2015 version update, X.Org 1.18 support
+4.5 12-MAR-2016 version update LLB, symlink fixes, drop nvidia-installer, get ready for 14.2
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
old mode 100644
new mode 100755
index 1040a67..3447f7c
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -26,11 +26,12 @@
# see changelog.txt
PRGNAM=nvidia-driver
-VERSION=${VERSION:-352.63}
-MVERS=340
+VERSION=${VERSION:-361.28}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
CPROXY=${CPROXY:-no}
+#GLVND=${GLVND:-no} # possibly switch needed?
+#break out compat32 as a separate package?
set -e
@@ -71,8 +72,6 @@ SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf nvidia-installer-$VERSION
-tar xvf $CWD/nvidia-installer-$VERSION.tar.bz2
rm -rf nvidia-settings-$VERSION
tar xvf $CWD/nvidia-settings-$VERSION.tar.bz2
rm -rf nvidia-xconfig-$VERSION
@@ -98,56 +97,94 @@ mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
# Get all the libs to the right place
install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/
+install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
+## GLVND libGL libraries for future consideration, conflict with non-GLVND versions
+#install -m 755 libGL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.1.0.0-nvidia
+#install -m 755 libGLX.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
+#
+# non-GLVND GLX client libraries are the default
+install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/
+#
+# we'll try leaving these in to get EGL etc support that needs GLVND (see README.txt)
+install -m 755 libEGL.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.1-nvidia
+install -m 755 libGLESv1_CM.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.1-nvidia
+install -m 755 libGLESv2.so.2 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.2-nvidia
+install -m 755 libGLESv1_CM_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libGLESv2_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libEGL_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libGLdispatch.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-eglcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libOpenGL.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
+#
+# Recommended GLVD bit
+install -m 755 libGLX_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+
+# All the rest...
install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION-nvidia
-install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.$VERSION-nvidia
-install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
-install -m 755 libEGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.$VERSION-nvidia
install -m 755 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-eglcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX
install -m 755 libnvidia-encode.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-fatbinaryloader.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-fbc.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-ifr.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-glsi.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-ifr.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/
-install -m 755 libGLESv1_CM.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.$VERSION
-install -m 755 libGLESv2.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.$VERSION
+install -m 755 libnvidia-ptxjitcompiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libvdpau_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
# For nvidia-settings GUI support
install -m 755 libnvidia-gtk2.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-gtk3.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-# Don't forget separate libvdpau package on SBo.
-install -m 755 libvdpau_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-
install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
# Add optional 32-bit support
if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
mkdir -p $PKG/usr/lib/tls
- install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/
- install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/libGL.so.$VERSION-nvidia
install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
- install -m 755 32/libEGL.so.$VERSION $PKG/usr/lib/libEGL.so.$VERSION-nvidia
- install -m 755 32/libGLESv1_CM.so.$VERSION $PKG/usr/lib/libGLESv1_CM.so.$VERSION
- install -m 755 32/libGLESv2.so.$VERSION $PKG/usr/lib/libGLESv2.so.$VERSION
+
+ ## GLVND libGL libraries for future consideration, conflict with non-GLVND versions
+#install -m 755 32/libGL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.1.0.0-nvidia
+#install -m 755 32/libGLX.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
+#
+# non-GLVND GLX client libraries are the default
+ install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/
+ install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
+ install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/
+#
+# we'll try leaving these in to get EGL etc support that needs GLVND (see README.txt)
+ install -m 755 32/libEGL.so.1 $PKG/usr/lib/libEGL.so.1-nvidia
+ install -m 755 32/libGLESv1_CM.so.1 $PKG/usr/lib/libGLESv1_CM.so.1-nvidia
+ install -m 755 32/libGLESv2.so.2 $PKG/usr/lib/libGLESv2.so.2-nvidia
+ install -m 755 32/libGLESv1_CM_nvidia.so.$VERSION $PKG/usr/lib/
+ install -m 755 32/libGLESv2_nvidia.so.$VERSION $PKG/usr/lib/
+ install -m 755 32/libEGL_nvidia.so.$VERSION $PKG/usr/lib/
+ install -m 755 32/libGLdispatch.so.0 $PKG/usr/lib$/
+ install -m 755 32/libnvidia-eglcore.so.$VERSION $PKG/usr/lib/
+ install -m 755 32/libOpenGL.so.0 $PKG/usr/lib/
+#
+# Recommended GLVD bit
+ install -m 755 32/libGLX_nvidia.so.$VERSION $PKG/usr/lib/
+
+# And the others...
+ install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvcuvid.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/
- install -m 755 32/libnvidia-eglcore.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-encode.so.$VERSION $PKG/usr/lib/
+ install -m 755 32/libnvidia-fatbinaryloader.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-fbc.so.$VERSION $PKG/usr/lib/
- install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-glsi.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-ifr.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-ml.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-opencl.so.$VERSION $PKG/usr/lib/
+ install -m 755 32/libnvidia-ptxjitcompiler.so.$VERSION $PKG/usr/lib/
install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/
install -m 755 32/libOpenCL.so.1.0.0 $PKG/usr/lib/
install -m 755 32/libvdpau_nvidia.so.$VERSION $PKG/usr/lib/
@@ -165,21 +202,33 @@ cd $PKG/usr/lib$LIBDIRSUFFIX
ln -sf libnvcuvid.so.$VERSION libnvcuvid.so.1
ln -sf libnvcuvid.so.1 libnvcuvid.so
ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
- ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
+ ln -sf tls/libnvidia-tls.so.$VERSION tls/libnvidia-tls.so
+ ln -sf libGLX_nvidia.so.$VERSION libGLX_nvidia.so.0
+ ln -sf libGLX_nvidia.so.$VERSION libGLX_indirect.so.0
+ ln -sf libOpenGL.so.0 libOpenGL.so
+ ln -sf libEGL_nvidia.so.$VERSION libEGL_nvidia.so.0
+ ln -sf libGLESv1_CM_nvidia.so.$VERSION libGLESv1_CM_nvidia.so.1
+ ln -sf libGLESv2_nvidia.so.$VERSION libGLESv2_nvidia.so.2
cd -
# symlinks for optional 32-bit support
if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
cd $PKG/usr/lib
- ln -sf libcuda.so.$VERSION libcuda.so.$MVERS
- ln -sf libcuda.so.$MVERS libcuda.so
+ ln -sf libcuda.so.$VERSION libcuda.so.1
+ ln -sf libcuda.so.1 libcuda.so
ln -sf libOpenCL.so.1.0.0 libOpenCL.so.1.0
ln -sf libOpenCL.so.1.0 libOpenCL.so.1
ln -sf libOpenCL.so.1 libOpenCL.so
ln -sf libnvcuvid.so.$VERSION libnvcuvid.so.1
ln -sf libnvcuvid.so.1 libnvcuvid.so
ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
- ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
+ ln -sf tls/libnvidia-tls.so.$VERSION tls/libnvidia-tls.so
+ ln -sf libGLX_nvidia.so.$VERSION libGLX_nvidia.so.0
+ ln -sf libGLX_nvidia.so.$VERSION libGLX_indirect.so.0
+ ln -sf libOpenGL.so.0 libOpenGL.so
+ ln -sf libEGL_nvidia.so.$VERSION libEGL_nvidia.so.0
+ ln -sf libGLESv1_CM_nvidia.so.$VERSION libGLESv1_CM_nvidia.so.1
+ ln -sf libGLESv2_nvidia.so.$VERSION libGLESv2_nvidia.so.2
cd -
fi
@@ -198,22 +247,6 @@ if [ "$ARCH" = "x86_64" -a "${CPROXY}" = "yes" ]; then
install -m 644 nvidia-cuda-mps-control.1.gz $PKG/usr/man/man1/
fi
-# Compiling nvidia-installer from source
-# Not really needed for this SBo package
-cd $TMP/nvidia-installer-$VERSION
- chown -R root:root .
- find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
- CFLAGS="$SLKCFLAGS" LDFLAGS="-lz" make
-
- install -m 755 _out/Linux_$TARGET/nvidia-installer $PKG/usr/bin/
- install -m 644 _out/Linux_$TARGET/nvidia-installer.1.gz $PKG/usr/man/man1/
-cd -
-
# Compiling nvidia-settings from source
cd $TMP/nvidia-settings-$VERSION
chown -R root:root .
@@ -282,7 +315,7 @@ cd -
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" make
-#FIXME: need rc.nvidia-persistenced script
+#FIXME: need rc.nvidia-persistenced script; see doc
install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
cd -
@@ -312,7 +345,9 @@ sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" \
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cd $TMP/$SRCNAM
cp -a LICENSE NVIDIA_Changelog README.txt html $PKG/usr/doc/$PRGNAM-$VERSION
+# sample start/stop scripts for nvidia-persistenced
cp -a nvidia-persistenced-init.tar.bz2 $PKG/usr/doc/$PRGNAM-$VERSION
+
cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 759e61e..4eaf179 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,30 +1,26 @@
PRGNAM="nvidia-driver"
-VERSION="352.63"
+VERSION="361.28"
HOMEPAGE="http://www.nvidia.com";
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/352.63/NVIDIA-Linux-x86-352.63.run \
- ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.63.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.63.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.63.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.63.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.63.tar.bz2";
-MD5SUM="7882ecda1763504beb10af77a21b21c5 \
- 805ae3c1167a0472dd62bcb036364ab3 \
- 6bb15d188e90dfe99ce0fd0e7bd1c926 \
- 88c1bdd242f1aa34d5b98b1ff12a24f7 \
- daf3b3b4847039d3028a1a2200448277 \
- a52e338d6c50560d4696b4531fe6b2cb"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/352.63/NVIDIA-Linux-x86_64-352.63.run \
- ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.63.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.63.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.63.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.63.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.63.tar.bz2";
-MD5SUM_x86_64="d4127834036fe24ec7a07999dadf3529 \
- 805ae3c1167a0472dd62bcb036364ab3 \
- 6bb15d188e90dfe99ce0fd0e7bd1c926 \
- 88c1bdd242f1aa34d5b98b1ff12a24f7 \
- daf3b3b4847039d3028a1a2200448277 \
- a52e338d6c50560d4696b4531fe6b2cb"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/361.28/NVIDIA-Linux-x86-361.28.run \
+ ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-361.28.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-361.28.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-361.28.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-361.28.tar.bz2";
+MD5SUM="d4fc7fcf1204a46f15733d7cc2711ad2 \
+ ded9f1d6bfc7cf7884f5bec41f2c1428 \
+ 7fffeeddbabe37ecf8186254f2f76c14 \
+ 70c379092e068e3da1192e41e8018360 \
+ 6fbae00939910f3019958876acd59017"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/361.28/NVIDIA-Linux-x86_64-361.28.run \
+ ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-361.28.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-361.28.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-361.28.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-361.28.tar.bz2";
+MD5SUM_x86_64="16a583d074a83c1a3ef926e9c59d4349 \
+ ded9f1d6bfc7cf7884f5bec41f2c1428 \
+ 7fffeeddbabe37ecf8186254f2f76c14 \
+ 70c379092e068e3da1192e41e8018360 \
+ 6fbae00939910f3019958876acd59017"
REQUIRES="nvidia-kernel"
MAINTAINER="Edward W. Koenig"
EMAIL="kingbeow...@gmail.com"
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index 68d9d4a..0e94541 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -20,7 +20,7 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# nvidia-switch utility 2.4
+# nvidia-switch utility 2.5
#
# A tool to install and cleanly remove the nvidia driver without stomping on the xorg files.
# Note: this tool "should" allow switching on the fly, but why? Pick a driver! You will still
@@ -48,23 +48,29 @@ save_GL(){
if [ "$1" = "nvidia" ]; then
if [ -e libGL.so.$GL_VERSION ]; then
mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg
- mv libGL.la libGL.la-xorg
+ mv libGL.la libGL.la-xorg
fi
- mv libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION
mv libGL.la-nvidia libGL.la
ln -sf libGL.so.$NV_VERSION libGL.so.1
ln -sf libGL.so.$NV_VERSION libGL.so
if [ -e libEGL.so.1.0.0 ]; then
mv libEGL.so.1.0.0 libEGL.so.1.0.0-xorg
fi
- mv libEGL.so.$NV_VERSION-nvidia libEGL.so.$NV_VERSION
- ln -sf libEGL.so.$NV_VERSION libEGL.so.1.0.0
- ln -sf libEGL.so.$NV_VERSION libEGL.so.1
- ln -sf libEGL.so.$NV_VERSION libEGL.so
+ mv libEGL.so.1-nvidia libEGL.so.1
+ ln -sf libEGL.so.1 libEGL.so
+ if [ -e libGLESv1_CM.so.1.1.0 ]; then
+ mv libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1.1.0-xorg
+ fi
+ mv libGLESv1_CM.so.1-nvidia libGLESv1_CM.so.1
+ ln -sf libGLESv1_CM.so.1 libGLESv1_CM.so
+ if [ -e libGLESv2.so.2.0.0 ]; then
+ mv libGLESv2.so.2.0.0 libGLESv2.so.2.0.0-xorg
+ fi
+ mv libGLESv2.so.2-nvidia libGLESv2.so.2
+ ln -sf libGLESv2.so.2 libGLESv2.so
fi
if [ "$1" = "xorg" ]; then
- mv libGL.so.$NV_VERSION libGL.so.$NV_VERSION-nvidia
mv libGL.la libGL.la-nvidia
if [ -e libGL.so.$GL_VERSION-xorg ]; then
mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION
@@ -72,13 +78,24 @@ save_GL(){
ln -sf libGL.so.$GL_VERSION libGL.so
mv libGL.la-xorg libGL.la
fi
- mv libEGL.so.$NV_VERSION libEGL.so.$NV_VERSION-nvidia
+ mv libEGL.so.1 libEGL.so.1-nvidia
if [ -e libEGL.so.1.0.0-xorg ]; then
mv libEGL.so.1.0.0-xorg libEGL.so.1.0.0
ln -sf libEGL.so.1.0.0 libEGL.so.1
ln -sf libEGL.so.1.0.0 libEGL.so
fi
-
+ mv libGLESv2.so.2 libGLESv2.so.2-nvidia
+ if [ -e libGLESv2.so.2.0.0-xorg ]; then
+ mv libGLESv2.so.2.0.0-xorg libGLESv2.so.2.0.0
+ ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
+ ln -sf libGLESv2.so.2.0.0 libGLESv2.so
+ fi
+ mv libGLESv1_CM.so.1 libGLESv1_CM.so.1-nvidia
+ if [ -e libGLESv1_CM.so.1.1.0-xorg ]; then
+ mv libGLESv1_CM.so.1.1.0-xorg libGLESv1_CM.so.1.1.0
+ ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1
+ ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so
+ fi
fi
cd "$CWD"
}
@@ -119,9 +136,6 @@ nvidia_install(){
if [ "$COMPAT32" = "yes" ]; then
save_GL "nvidia" $LIB32
fi
-
-# LD_NVIDIA="${LIB}/libGL.so.$NV_VERSION"
-# nvidia_ldconfig $LD_NVIDIA
}
nvidia_remove(){
@@ -132,30 +146,24 @@ nvidia_remove(){
save_GL "xorg" $LIB
save_glx "xorg"
+
+ # Kill dangling symlinks; check next mesa version for libGLES presence.
+ rm -f $LIB/libnvidia*.so.1
+ rm -f $LIB/libvdpau_nvidia.so.1
+ rm -f $LIB/libcuda.so.1
+
# Check for multilib configuration
if [ "$COMPAT32" = "yes" ]; then
save_GL "xorg" $LIB32
# remove dangling symlinks
- rm -f $LIB32/libGLESv1_CM.so.1
- rm -f $LIB32/libGLESv2.so.2
rm -f $LIB32/libnvidia*.so.1
- rm -f $LIB32/libvdpau-nvidia.so.1
+ rm -f $LIB32/libvdpau_nvidia.so.1
rm -f $LIB32/libcuda.so.1
fi
if [ -e $NV_CONF ]; then
rm -f $NV_CONF
fi
-
-# LD_NVIDIA="${LIB}/libGL.so.$GL_VERSION"
-# nvidia_ldconfig $LD_NVIDIA # screws up multilub /usr/lib links?
-
-# Kill two dangling symlinks; check next mesa version for libGLES presence.
- rm -f $LIB/libGLESv1_CM.so.1
- rm -f $LIB/libGLESv2.so.2
- rm -f $LIB/libnvidia*.so.1
- rm -f $LIB/libvdpau-nvidia.so.1
- rm -f $LIB/libcuda.so.1
}
usage(){
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
old mode 100644
new mode 100755
index 1d12dbd..c39e3ec
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for nvidia-kernel
# Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2012-2015 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2012-2016 Edward W. Koenig, Vancouver, WA, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -28,8 +28,8 @@
# see nvidia-driver/changelog.txt
PRGNAM=nvidia-kernel
-VERSION=${VERSION:-352.63}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-361.28}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
KERNEL=${KERNEL:-$(uname -r)}
@@ -79,19 +79,16 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Nvidia removed uvm module from 32-bit
(cd kernel || exit 1
make SYSSRC=$KERNELPATH module || exit 1
- if [ "$ARCH" = "x86_64" ]; then
- cd uvm
- make SYSSRC=$KERNELPATH module || exit 1
- fi
)
mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
install -m 0664 kernel/nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
-if [ "$ARCH" = "x86_64" ]; then
- install -m 0664 kernel/uvm/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+install -m 0664 kernel/nvidia-modeset.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+# 32-bit doesn't have nvidia-uvm
+if [ "$TARGET" = "x86_64" ]; then
+ install -m 0664 kernel/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
fi
# Make sure the X is specified to automagically load the
@@ -100,9 +97,6 @@ fi
mkdir -p $PKG/usr/share/X11/xorg.conf.d/
cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
-# OutputClass not available until xorg > 1.16 so fix this up a bit
-sed -i "s|OutputClass|Device|" $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
-sed -i "s|Match|# Match|" $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index 7fb4833..4104002 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,10 @@
PRGNAM="nvidia-kernel"
-VERSION="352.63"
+VERSION="361.28"
HOMEPAGE="http://www.nvidia.com";
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/352.63/NVIDIA-Linux-x86-352.63.run";
-MD5SUM="7882ecda1763504beb10af77a21b21c5"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/352.63/NVIDIA-Linux-x86_64-352.63.run";
-MD5SUM_x86_64="d4127834036fe24ec7a07999dadf3529"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/361.28/NVIDIA-Linux-x86-361.28.run";
+MD5SUM="d4fc7fcf1204a46f15733d7cc2711ad2"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/361.28/NVIDIA-Linux-x86_64-361.28.run";
+MD5SUM_x86_64="16a583d074a83c1a3ef926e9c59d4349"
REQUIRES=""
MAINTAINER="Edward W. Koenig"
EMAIL="kingbeow...@gmail.com"
signature.asc
Description: OpenPGP digital signature
_______________________________________________ SlackBuilds-users mailing list SlackBuilds-users@slackbuilds.org http://lists.slackbuilds.org/mailman/listinfo/slackbuilds-users Archives - http://lists.slackbuilds.org/pipermail/slackbuilds-users/ FAQ - http://slackbuilds.org/faq/
