diff options
5 files changed, 32 insertions, 12 deletions
diff --git a/system/nvidia-legacy304-driver/changelog.txt b/system/nvidia-legacy304-driver/changelog.txt index fc2924d40d..1f4ed30795 100644 --- a/system/nvidia-legacy304-driver/changelog.txt +++ b/system/nvidia-legacy304-driver/changelog.txt @@ -14,3 +14,4 @@ 3.3 05-SEP-2015 version update 3.4 13-DEC-2015 version update, X.org 1.18 3.5 19-MAR-2016 remove nvidia-installer (doesn't compile on 14.2RC1), minor edits +3.6 16-OCT-2016 bug fixes, added nvidia-installer diff --git a/system/nvidia-legacy304-driver/doinst.sh b/system/nvidia-legacy304-driver/doinst.sh index 8ee62f049e..38e4ec92de 100644 --- a/system/nvidia-legacy304-driver/doinst.sh +++ b/system/nvidia-legacy304-driver/doinst.sh @@ -2,5 +2,5 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications fi -./usr/sbin/nvidia-switch --install +/usr/sbin/nvidia-switch --install diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild index dab5100ba8..79f0b67a9c 100644 --- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild +++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild @@ -30,13 +30,13 @@ PRGNAM=nvidia-legacy304-driver VERSION=${VERSION:-304.131} MVERS=304 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CPROXY=${CPROXY:-no} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -47,8 +47,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" TARGET="x86" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then @@ -73,6 +73,8 @@ set -e 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 @@ -106,6 +108,8 @@ 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 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/ +install -m 755 libXvMCNVIDIA.a $PKG/usr/lib$LIBDIRSUFFIX/ +install -m 755 libXvMCNVIDIA.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ # For 8-series GPU if libwfb.so is missing (ie older X servers). install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/libnvidia-wfb.so.$VERSION-nvidia @@ -173,6 +177,22 @@ 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...yet! +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 . diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info index c3f37ee05e..25653d466e 100644 --- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info +++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info @@ -2,15 +2,19 @@ PRGNAM="nvidia-legacy304-driver" VERSION="304.131" HOMEPAGE="http://www.nvidia.com" DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.131/NVIDIA-Linux-x86-304.131.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.131.tar.bz2 \ ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.131.tar.bz2 \ ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.131.tar.bz2" MD5SUM="9f3222fd7287d9b31f54f1d75760e183 \ + 682e392770b5763fb018d6e2193b2bbd \ fd5535623e840330cd05fe7e05278ec4 \ e3c8f8c3918449728a8da09863a03d3c" DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.131/NVIDIA-Linux-x86_64-304.131.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.131.tar.bz2 \ ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.131.tar.bz2 \ ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.131.tar.bz2" MD5SUM_x86_64="e80db7eaf32294d4066f841f0870a85a \ + 682e392770b5763fb018d6e2193b2bbd \ fd5535623e840330cd05fe7e05278ec4 \ e3c8f8c3918449728a8da09863a03d3c" REQUIRES="nvidia-legacy304-kernel" diff --git a/system/nvidia-legacy304-driver/nvidia-switch b/system/nvidia-legacy304-driver/nvidia-switch index 0681d52693..4ac2648e9c 100644 --- a/system/nvidia-legacy304-driver/nvidia-switch +++ b/system/nvidia-legacy304-driver/nvidia-switch @@ -30,7 +30,7 @@ set -e -ROOT="${ROOT:-/}" +ROOT="/" CWD=$(pwd) LIBSUFFIX="LIBDIRSUFFIX" # This will be replaced in the build script COMPAT32="LIB32FLAG" # This will be replaced in the build script (yes | no) @@ -53,9 +53,6 @@ save_GL(){ mv libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION ln -sf libGL.so.$NV_VERSION libGL.so.1 ln -sf libGL.so.$NV_VERSION libGL.so - if [ ! -e libEGL.so.1.0.0-xorg ]; then - mv libEGL.so.1.0.0 libEGL.so.1.0.0-xorg - fi mv libGL.la-nvidia libGL.la fi @@ -68,7 +65,7 @@ save_GL(){ ln -sf libGL.so.$GL_VERSION libGL.so mv libGL.la-xorg libGL.la else - echo WARNING: libGL.so is missing. + echo WARNING: libGL.so.$GL_VERSION is missing. fi fi @@ -101,7 +98,6 @@ save_glx(){ cd "$XLIB" if [ "$1" = "nvidia" ]; then if [ ! -e libglx.so-xorg ]; then - mv libglx.la libglx.la-xorg mv libglx.so libglx.so-xorg fi ln -sf libglx.so.$NV_VERSION-nvidia libglx.so.$NV_VERSION @@ -110,7 +106,6 @@ save_glx(){ rm -f libglx.so.$NV_VERSION rm -f libglx.so mv libglx.so-xorg libglx.so - mv libglx.la-xorg libglx.la fi cd "$CWD" } |