summaryrefslogtreecommitdiff
path: root/system/nvidia-legacy96-driver
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@liwjatan.at>2011-01-09 12:52:22 -0500
committerRobby Workman <rworkman@slackbuilds.org>2011-01-10 15:04:45 -0600
commit71cf248a4e57ec0ccaac6ca11a0a739aebfcff48 (patch)
tree87ce7f5ec414e3552f07525191438074a5c90c18 /system/nvidia-legacy96-driver
parenta68e9505cbe8a7c507a31b512c46176d0c261068 (diff)
downloadslackbuilds-71cf248a4e57ec0ccaac6ca11a0a739aebfcff48.tar.gz
system/nvidia-legacy96-driver: Updated for version 96.43.19.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'system/nvidia-legacy96-driver')
-rw-r--r--system/nvidia-legacy96-driver/Makefile-libXNVCtrl32
-rw-r--r--system/nvidia-legacy96-driver/NvCtrlAttributesVidMode.diff10
-rw-r--r--system/nvidia-legacy96-driver/nvidia-legacy96-driver.SlackBuild94
-rw-r--r--system/nvidia-legacy96-driver/nvidia-legacy96-driver.info22
4 files changed, 136 insertions, 22 deletions
diff --git a/system/nvidia-legacy96-driver/Makefile-libXNVCtrl b/system/nvidia-legacy96-driver/Makefile-libXNVCtrl
new file mode 100644
index 0000000000..15b03cc3ee
--- /dev/null
+++ b/system/nvidia-legacy96-driver/Makefile-libXNVCtrl
@@ -0,0 +1,32 @@
+# Copyright (c) 2008 NVIDIA, Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+RANLIB ?= ranlib
+
+libXNVCtrl.a : libXNVCtrl.a(NVCtrl.o)
+ $(RANLIB) $@
+
+NVCtrl.o : NVCtrl.h nv_control.h NVCtrlLib.h
+.INTERMEDIATE: NVCtrl.o
+
+clean ::
+ rm -f libXNVCtrl.a *.o
+.PHONY: clean
diff --git a/system/nvidia-legacy96-driver/NvCtrlAttributesVidMode.diff b/system/nvidia-legacy96-driver/NvCtrlAttributesVidMode.diff
new file mode 100644
index 0000000000..d3e1fae244
--- /dev/null
+++ b/system/nvidia-legacy96-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-legacy96-driver/nvidia-legacy96-driver.SlackBuild b/system/nvidia-legacy96-driver/nvidia-legacy96-driver.SlackBuild
index 2ffd6438db..6dec81767c 100644
--- a/system/nvidia-legacy96-driver/nvidia-legacy96-driver.SlackBuild
+++ b/system/nvidia-legacy96-driver/nvidia-legacy96-driver.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for nvidia-legacy96-driver
-# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=nvidia-legacy96-driver
-VERSION=96.43.18
+VERSION=96.43.19
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -41,12 +41,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
@@ -61,6 +64,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
@@ -68,7 +77,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
@@ -101,20 +111,7 @@ 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 -
-
-# XDG stuff
-cd usr/share
- for i in applications pixmaps; do
- cp -a $i $PKG/usr/share/
- done
- cp -a man* $PKG/usr/
-cd -
+cp -a usr/bin/nvidia-bug-report.sh $PKG/usr/bin/
# symlinks
cd $PKG/usr/lib$LIBDIRSUFFIX
@@ -132,6 +129,66 @@ cd $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules
ln -sf libnvidia-wfb.so.$VERSION libnvidia-wfb.so.1
cd -
+# XDG stuff
+cd usr/share
+ for i in applications pixmaps; do
+ cp -a $i $PKG/usr/share/
+ done
+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
+ rm libXNVCtrl.a
+ cp $CWD/Makefile-libXNVCtrl ./Makefile
+ 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.
@@ -139,6 +196,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-legacy96-driver/nvidia-legacy96-driver.info b/system/nvidia-legacy96-driver/nvidia-legacy96-driver.info
index 34e0bf87cd..f03018343c 100644
--- a/system/nvidia-legacy96-driver/nvidia-legacy96-driver.info
+++ b/system/nvidia-legacy96-driver/nvidia-legacy96-driver.info
@@ -1,10 +1,22 @@
PRGNAM="nvidia-legacy96-driver"
-VERSION="96.43.18"
+VERSION="96.43.19"
HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/96.43.18/NVIDIA-Linux-x86-96.43.18-pkg0.run"
-MD5SUM="f19041ded11947c54ac9f31dc1496e3b"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/96.43.18/NVIDIA-Linux-x86_64-96.43.18-pkg0.run"
-MD5SUM_x86_64="10105692a6578862221a97e24267a9e4"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/96.43.19/NVIDIA-Linux-x86-96.43.19-pkg0.run \
+ ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-96.43.19.tar.gz \
+ ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-96.43.19.tar.gz \
+ ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-96.43.19.tar.gz"
+MD5SUM="53e98129d885a1b004aabc42a989fa73 \
+ b551beb48f4577b6a4444860583a5886 \
+ 020e5e1d9e99331e37a06676328a9134 \
+ 56dd83c7066e30505df3f52c42c4cd3e"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/96.43.19/NVIDIA-Linux-x86_64-96.43.19-pkg0.run \
+ ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-96.43.19.tar.gz \
+ ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-96.43.19.tar.gz \
+ ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-96.43.19.tar.gz"
+MD5SUM_x86_64="7ff779e299b938b880baff6cd970ab51 \
+ b551beb48f4577b6a4444860583a5886 \
+ 020e5e1d9e99331e37a06676328a9134 \
+ 56dd83c7066e30505df3f52c42c4cd3e"
MAINTAINER="Heinz Wiesinger"
EMAIL="pprkut@liwjatan.at"
APPROVED="dsomero"