summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorEdward Koenig <kingbeowulf@gmail.com>2012-09-25 23:07:57 -0500
committerRobby Workman <rworkman@slackbuilds.org>2012-09-26 00:00:13 -0500
commit4974e2113469883343f64ed33e7fb5f9523628fb (patch)
treef2e523c1ff0424caa72e14918783ab785df8a91e /system
parent230b2afb709c967ff53c2ddc25eee79113dbb739 (diff)
downloadslackbuilds-4974e2113469883343f64ed33e7fb5f9523628fb.tar.gz
system/nvidia-driver: fix a few typos and broken symlinks
Thanks to Das. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/nvidia-driver/nvidia-driver.SlackBuild16
1 files changed, 7 insertions, 9 deletions
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 9e36fedc24..d46c4f12a0 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -37,13 +37,15 @@
# 1.9 02-AUG-2012 version bmp, fixes, updates, nvidia-switch for install/uninstall only
# 1.9a 21-AUG-2012 fix for libvdpau (per post on mail list) --rworkman
# 1.9b 10-SEP-2012 fix glx.h missing extension (per email, list and LQ)
+# 1.9c 25-SEP-2012 fix symlinks (thanks to Das via email)
PRGNAM=nvidia-driver
-VERSION=302.17
-MVERS=302
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-302.17}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
+MVERS=$(printf $VERSION | cut -d. -f1)
+
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
@@ -110,7 +112,7 @@ install -m 444 libXvMCNVIDIA.a $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libXvMCNVIDIA.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/
+install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/libnvidia-wfb.so.$VERSION-nvidia
install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
@@ -150,14 +152,10 @@ cd $PKG/usr/lib$LIBDIRSUFFIX
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 libnvcuvidv.so.$VERSION libnvcuvid.so
+ ln -sf libnvcuvid.so.$VERSION libnvcuvid.so
ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
cd -
-cd $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules
- ln -sf libnvidia-wfb.so.$VERSION libnvidia-wfb.so
-cd -
-
# symlinks for optional 32-bit support
if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
cd $PKG/usr/lib