system/nvidia-legacy173-driver: Updated for version 173.14.28.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

3 files changed, 96 insertions, 15 deletions

diff --git a/system/nvidia-legacy173-driver/NvCtrlAttributesVidMode.diff b/system/nvidia-legacy173-driver/NvCtrlAttributesVidMode.diff
new file mode 100644
index 0000000000000..d3e1fae2444d2
--- /dev/null
+++ b/system/nvidia-legacy173-driver/NvCtrlAttributesVidMode.diff
@@ -0,0 +1,10 @@
+--- nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c	2010-10-28 04:23:19.000000000 +0200
++++ nvidia-settings-1.0-mod/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c	2011-01-04 11:43:54.888000046 +0100
+@@ -28,6 +28,7 @@
+ #include "msg.h"
+ 
+ #include <X11/extensions/xf86vmode.h>
++#include <X11/extensions/xf86vmproto.h>
+ 
+ #include <stdlib.h>
+ #include <math.h>
diff --git a/system/nvidia-legacy173-driver/nvidia-legacy173-driver.SlackBuild b/system/nvidia-legacy173-driver/nvidia-legacy173-driver.SlackBuild
index d27932cec86a9..d7c011d2cb6e8 100644
--- a/system/nvidia-legacy173-driver/nvidia-legacy173-driver.SlackBuild
+++ b/system/nvidia-legacy173-driver/nvidia-legacy173-driver.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for nvidia-legacy173-driver
 
-# Copyright 2007-2010 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # Thanks to Robby Workman for suggestions to improve this script.
 
 PRGNAM=nvidia-legacy173-driver
-VERSION=173.14.27
+VERSION=173.14.28
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,12 +43,15 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   TARGET="x86"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   TARGET="x86"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
   TARGET="x86_64"
   LIBDIRSUFFIX="64"
 else
@@ -63,6 +66,12 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+rm -rf nvidia-installer-1.0.7
+tar xvf $CWD/nvidia-installer-$VERSION.tar.gz
+rm -rf nvidia-settings-1.0
+tar xvf $CWD/nvidia-settings-$VERSION.tar.gz
+rm -rf nvidia-xconfig-1.0
+tar xvf $CWD/nvidia-xconfig-$VERSION.tar.gz
 rm -rf $SRCNAM
 sh $CWD/$SRCNAM.run --extract-only
 cd $SRCNAM
@@ -70,7 +79,8 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 mkdir -p $PKG/usr/{bin,share,lib$LIBDIRSUFFIX,sbin} $PKG/usr/include/GL \
-  $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions}
+  $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
+  $PKG/usr/man/man1
 
 # Start with the libraries
 cd usr/lib
@@ -103,19 +113,13 @@ cd usr/include/GL
 cd -
 
 # Next come the apps
-cp -a nvidia-installer $PKG/usr/bin/
-cd usr/bin
-  for i in nvidia*; do
-    cp -a $i $PKG/usr/bin/
-  done
-cd -
+cp -a usr/bin/nvidia-bug-report.sh $PKG/usr/bin/
 
 # XDG stuff
 cd usr/share
   for i in applications pixmaps; do
     cp -a $i $PKG/usr/share/
   done
-  cp -a man* $PKG/usr/
 cd -
 
 # symlinks
@@ -136,6 +140,58 @@ cd $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules
   ln -sf libnvidia-wfb.so.$VERSION libnvidia-wfb.so.1
 cd -
 
+# Compiling nvidia-installer from source
+cd $TMP/nvidia-installer-1.0.7
+  chown -R root:root .
+  chmod -R u+w,go+r-w,a-s .
+
+  CFLAGS="$SLKCFLAGS" \
+  LDFLAGS="-lz" \
+  make
+
+  install -m 755 nvidia-installer $PKG/usr/bin/
+  install -m 644 nvidia-installer.1 $PKG/usr/man/man1/
+cd -
+
+# Compiling nvidia-settings from source
+cd $TMP/nvidia-settings-1.0
+  chown -R root:root .
+  chmod -R u+w,go+r-w,a-s .
+
+  # Fix missing include necessary for newer version of libXxf86vm
+  patch -p1 -i $CWD/NvCtrlAttributesVidMode.diff
+
+  # Slackware doesn't ship a static libXxf86vm, so we link against the shared one
+  sed -i "s|-Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic|-Wl,-Bdynamic -lXxf86vm|" \
+    Makefile
+
+  cd src/libXNVCtrl
+    make clean
+    CFLAGS="$SLKCFLAGS" \
+    make
+  cd ../../
+
+  CFLAGS="$SLKCFLAGS" \
+  NV_CFLAGS="$SLKCFLAGS" \
+  X11_LIB_DIRS="-L/usr/lib$LIBDIRSUFFIX" \
+  make
+
+  install -m 755 nvidia-settings $PKG/usr/bin/
+  install -m 644 doc/nvidia-settings.1 $PKG/usr/man/man1/
+cd ../
+
+# Compiling nvidia-xconfig from source
+cd $TMP/nvidia-xconfig-1.0
+  chown -R root:root .
+  chmod -R u+w,go+r-w,a-s .
+
+  NV_CFLAGS="$SLKCFLAGS" \
+  make
+
+  install -m 755 nvidia-xconfig $PKG/usr/bin/
+  install -m 644 nvidia-xconfig.1 $PKG/usr/man/man1/
+cd -
+
 # Self written bash script which I use to switch between nvidia and nv.
 # It is now also used by doinst.sh to switch to the nvidia-driver right
 # after installation.
@@ -143,6 +199,9 @@ install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/
 sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch
 sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch
 
+# Compress man-pages
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 # These correct wrong paths
 sed -i "s|__LIBGL_PATH__|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
 sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
diff --git a/system/nvidia-legacy173-driver/nvidia-legacy173-driver.info b/system/nvidia-legacy173-driver/nvidia-legacy173-driver.info
index e94370e0ded0a..d98f206c299c7 100644
--- a/system/nvidia-legacy173-driver/nvidia-legacy173-driver.info
+++ b/system/nvidia-legacy173-driver/nvidia-legacy173-driver.info
@@ -1,10 +1,22 @@
 PRGNAM="nvidia-legacy173-driver"
-VERSION="173.14.27"
+VERSION="173.14.28"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/173.14.27/NVIDIA-Linux-x86-173.14.27-pkg0.run"
-MD5SUM="35a6531f71cd6b070f10be8ed11093d4"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.27/NVIDIA-Linux-x86_64-173.14.27-pkg0.run"
-MD5SUM_x86_64="269425dbc2d9d4ecdc54692281d6d738"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/173.14.28/NVIDIA-Linux-x86-173.14.28-pkg0.run \
+    ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-173.14.28.tar.gz \
+    ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-173.14.28.tar.gz \
+    ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-173.14.28.tar.gz"
+MD5SUM="3b2085ffc2047e701a01b3163129f763 \
+    359f22dd48a9ade21c496810af1a0aa0 \
+    59ae94aa91a5e8230813f201415df7f1 \
+    6e324746ae7659386c3d797c1a748ebb"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.28/NVIDIA-Linux-x86_64-173.14.28-pkg0.run \
+    ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-173.14.28.tar.gz \
+    ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-173.14.28.tar.gz \
+    ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-173.14.28.tar.gz"
+MD5SUM_x86_64="8f48430f2b759d4efbf022cb415ecc5d \
+    359f22dd48a9ade21c496810af1a0aa0 \
+    59ae94aa91a5e8230813f201415df7f1 \
+    6e324746ae7659386c3d797c1a748ebb"
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
 APPROVED="dsomero"