[Lunar-commits] <moonbase-xorg> NVIDIA: Module refactored and x86 version bumped to 319.32
Stefan Wold
ratler at lunar-linux.org
Thu Jul 25 11:24:36 CEST 2013
commit 48350b96b276b26f6050fdf79529be86f6c90044
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sun, 07 Jul 2013 02:27:52 -0700
URL: https://github.com/lunar-linux/moonbase-xorg/commit/48350b96b276b26f6050fdf79529be86f6c90044
NVIDIA: Module refactored and x86 version bumped to 319.32
---
driver/NVIDIA/BUILD | +113/-171
driver/NVIDIA/BUILD.x86_64 | +126/-0
driver/NVIDIA/DETAILS | +6/-6
driver/NVIDIA/PRE_BUILD | +19/-1
4 files changed, 264 insertions(+), 178 deletions(-)
--- a/driver/NVIDIA/BUILD
+++ b/driver/NVIDIA/BUILD
@@ -1,177 +1,119 @@
-(
- # Fix for x86_64 with kernel >= 3.10
- if [[ $(arch) == x86_64 ]]; then
- patch_it $SOURCE5 1
- fi &&
-
- # This is an installer-less build script. If you find bugs let me know by e-mail: zbiggy(0)o2(period)pl
-
- GCCKNL=`cat /proc/version | cut -d\( -f3 | cut -d\ -f3`
- GCCNOW=`gcc --version | grep gcc | cut -d\ -f3`
- if [ $GCCKNL != $GCCNOW ]; then
- message "${PROBLEM_COLOR}The kernel is compiled using gcc version: $GCCKNL"
- message "but you try to compile nvidia kernel module with"
- message "gcc version: $GCCNOW. You can not use different"
- message "gcc to build kernel and modules. Please lin kernel"
- message "with current gcc, then reboot and lin nvidia driver.${DEFAULT_COLOR}"
- exit 1
- fi &&
-
- # Fix for broken MSI in driver
-
- # Remove files to avoid module conflicts and
- # make place for source compiled replacements
- rm -f .manifest libvdpau.so* libvdpau_trace.so* \
- pkg-history.txt nvidia-installer{,.*} \
- mkprecompiled nvidia-xconfig{,.*} nvidia-settings{,.*} \
- libnvidia-wfb* tls_test* libGL.la gl*.h &&
-
- # Temporary paths and symlinks to make sources compilable
- LD_LIBRARY_PATH="$SOURCE_DIRECTORY:$LD_LIBRARY_PATH" &&
- CFLAGS=" -L$SOURCE_DIRECTORY $CFLAGS " &&
- export SYSSRC=/usr/src/linux &&
- ln -s libGL.so.$VERSION nvidia-installer-$VERSION/libGL.so &&
- ln -s libnvidia-glcore.so.$VERSION nvidia-installer-$VERSION/libGLcore.so.1 &&
- ln -s libnvidia-tls.so.$VERSION nvidia-installer-$VERSION/libnvidia-tls.so.1 &&
-
- echo libXvMCNVIDIA_dynamic.so.1 > XvMCConfig &&
-
- # Builds nvidia-installer from source
- cd nvidia-installer-$VERSION &&
- rm -f *Linux* &&
-
- if [[ $(arch) == x86_64 ]] ; then
- # Don't compile 32-bits on pure 64-bit Lunar
- sedit 's/COMPAT_32_SRC *= */\0#/' Makefile &&
- sedit 's/-DNV_X86_64//' Makefile
+# Temporary paths and symlinks to make sources compilable
+LD_LIBRARY_PATH="$SOURCE_DIRECTORY:$LD_LIBRARY_PATH" &&
+CFLAGS=" -L$SOURCE_DIRECTORY $CFLAGS " &&
+export SYSSRC=/usr/src/linux &&
+ln -s libGL.so.$VERSION nvidia-installer-$VERSION/libGL.so &&
+ln -s libnvidia-glcore.so.$VERSION nvidia-installer-$VERSION/libGLcore.so.1 &&
+ln -s libnvidia-tls.so.$VERSION nvidia-installer-$VERSION/libnvidia-tls.so.1 &&
+
+echo libXvMCNVIDIA_dynamic.so.1 > XvMCConfig &&
+
+# Builds nvidia-installer from source
+cd nvidia-installer-$VERSION &&
+rm -f *Linux* &&
+
+make clean &&
+make rebuild_tls_test &&
+make rebuild_tls_test_dso &&
+make rebuild_rtld_test &&
+make &&
+install -m 755 _out/Linux_x86/nvidia-installer .. &&
+install -m 755 _out/Linux_x86/mkprecompiled .. &&
+install -m 644 _out/Linux_x86/nvidia-installer.1.gz .. &&
+cp tls_test_`uname`-x86 ../tls_test &&
+cp tls_test_dso_`uname`-x86.so ../tls_test_dso.so &&
+cd .. &&
+
+if in_depends $MODULE "gtk+-2" ; then
+ # Builds nvidia-settings from source
+ cd nvidia-settings-$VERSION &&
+
+ # xf86vmode.h has been removed in xf86vidmodeproto 2.3
+ if [[ ! -e /usr/include/X11/extensions/xf86vmode.h ]] ; then
+ sedit "s:#include <X11/extensions/xf86vmode.h>:#include <X11/extensions/xf86vmproto.h>:" src/libXNVCtrlAttributes/NvCtrlAttributes{,VidMode,Glx}.c
fi &&
make clean &&
- make rebuild_tls_test &&
- make rebuild_tls_test_dso &&
- make rebuild_rtld_test &&
+ make -C src/libXNVCtrl clean &&
+ make -C src/libXNVCtrl &&
make &&
- if [[ $(arch) == x86_64 ]] ; then
- install -m 755 _out/Linux_x86_64/nvidia-installer .. &&
- install -m 755 _out/Linux_x86_64/mkprecompiled .. &&
- install -m 644 _out/Linux_x86_64/nvidia-installer.1.gz .. &&
- cp tls_test_`uname`-x86_64 ../tls_test &&
- cp tls_test_dso_`uname`-x86_64.so ../tls_test_dso.so
- else
- install -m 755 _out/Linux_x86/nvidia-installer .. &&
- install -m 755 _out/Linux_x86/mkprecompiled .. &&
- install -m 644 _out/Linux_x86/nvidia-installer.1.gz .. &&
- cp tls_test_`uname`-x86 ../tls_test &&
- cp tls_test_dso_`uname`-x86.so ../tls_test_dso.so
- fi &&
-
+ install -m 755 src/_out/Linux_x86/nvidia-settings .. &&
+ install -m 644 doc/_out/Linux_x86/nvidia-settings.1.gz .. &&
+ sedit 's/__UTILS_PATH__/\/usr\/bin/' doc/nvidia-settings.desktop &&
+ sedit 's/__PIXMAP_PATH__/\/usr\/share\/doc\/NVIDIA_GLX-1.0/' doc/nvidia-settings.desktop &&
+ sedit 's/__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__/Settings;DesktopSettings;/' doc/nvidia-settings.desktop &&
cd ..
- if in_depends $MODULE "gtk+-2" ; then
- # Builds nvidia-settings from source
- cd nvidia-settings-$VERSION &&
-
- # xf86vmode.h has been removed in xf86vidmodeproto 2.3
- if [[ ! -e /usr/include/X11/extensions/xf86vmode.h ]] ; then
- sedit "s:#include <X11/extensions/xf86vmode.h>:#include <X11/extensions/xf86vmproto.h>:" src/libXNVCtrlAttributes/NvCtrlAttributes{,VidMode,Glx}.c
- fi &&
-
- make clean &&
- make -C src/libXNVCtrl clean &&
- make -C src/libXNVCtrl &&
-# X_CFLAGS=$CFLAGS GL_INCLUDE_PATH=$SOURCE_DIRECTORY
- make &&
- if [[ $(arch) == x86_64 ]] ; then
- install -m 755 src/_out/Linux_x86_64/nvidia-settings .. &&
- install -m 644 doc/_out/Linux_x86_64/nvidia-settings.1.gz ..
- else
- install -m 755 src/_out/Linux_x86/nvidia-settings .. &&
- install -m 644 doc/_out/Linux_x86/nvidia-settings.1.gz ..
- fi &&
- sedit 's/__UTILS_PATH__/\/usr\/bin/' doc/nvidia-settings.desktop &&
- sedit 's/__PIXMAP_PATH__/\/usr\/share\/doc\/NVIDIA_GLX-1.0/' doc/nvidia-settings.desktop &&
- sedit 's/__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__/Settings;DesktopSettings;/' doc/nvidia-settings.desktop &&
- cd ..
- fi &&
-
- # Builds nvidia-xconfig from source
- cd nvidia-xconfig-$VERSION &&
- make clean &&
- make &&
- if [[ $(arch) == x86_64 ]] ; then
- install -m 755 _out/Linux_x86_64/nvidia-xconfig .. &&
- install -m 644 _out/Linux_x86_64/nvidia-xconfig.1.gz ..
- else
- install -m 755 _out/Linux_x86/nvidia-xconfig .. &&
- install -m 644 _out/Linux_x86/nvidia-xconfig.1.gz ..
- fi &&
- cd .. &&
-
- # We make the kernel modules on our own
- cd kernel &&
- sedit "s@\$\(shell uname -r\)@`cat /usr/src/linux/include/config/kernel.release`@" Makefile.* makefile &&
-# sedit "s/-O/$CFLAGS/" Makefile.nvidia &&
-# NV_VERBOSE=0 EXTRA_CFLAGS=$CFLAGS ARCH=
- make module &&
- rm -f $SOURCE_DIRECTORY/{libGL.so,libGLcore.so.1,libnvidia-tls.so.1} &&
-
- prepare_install &&
-
- make install &&
-# NV_VERBOSE=0 EXTRA_CFLAGS=$CFLAGS ARCH=
- cd .. &&
-
- mkdir -p /etc/OpenCL/vendors &&
- install -m0444 nvidia.icd /etc/OpenCL/vendors &&
- install -m0755 nvidia-bug-report.sh /usr/bin &&
- install -m0755 nvidia-installer /usr/bin &&
- install -m0755 nvidia-smi /usr/bin &&
- ln -sf /usr/bin/nvidia-installer /usr/bin/nvidia-uninstall &&
- install -m0755 nvidia-xconfig /usr/bin &&
-
- install -m0755 libnv*.so.$VERSION /usr/lib &&
- ln -sf /usr/lib/libnvidia-cfg.so.$VERSION /usr/lib/libnvidia-cfg.so.1 &&
- ln -sf /usr/lib/libnvidia-cfg.so.1 /usr/lib/libnvidia-cfg.so &&
-
- install -m0755 libcuda.so.$VERSION /usr/lib &&
- ln -sf /usr/lib/libcuda.so.$VERSION /usr/lib/libcuda.so.1 &&
- ln -sf /usr/lib/libcuda.so.1 /usr/lib/libcuda.so &&
-
- install -m0755 libGL.so.$VERSION /usr/lib &&
-
- install -m0755 libOpenCL.so.1.0.0 /usr/lib &&
- ln -sf /usr/lib/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so.1.0 &&
- ln -sf /usr/lib/libOpenCL.so.1.0 /usr/lib/libOpenCL.so.1 &&
- ln -sf /usr/lib/libOpenCL.so.1 /usr/lib/libOpenCL.so &&
-
- mkdir -p /usr/lib/tls &&
- install -m0755 tls/libnvidia-tls.so.$VERSION /usr/lib/tls &&
-
- install -m0755 libvdpau_nvidia.so.$VERSION /usr/lib/vdpau &&
- ln -sf /usr/lib/vdpau/libvdpau_nvidia.so.$VERSION /usr/lib/vdpau/libvdpau_nvidia.so.1 &&
- ln -sf /usr/lib/vdpau/libvdpau_nvidia.so.1 /usr/lib/libvdpau_nvidia.so &&
-
- mkdir -p /usr/lib/xorg/modules/drivers &&
- install -m0755 nvidia_drv.so /usr/lib/xorg/modules/drivers &&
- mkdir -p /usr/lib/xorg/modules/extensions &&
- install -m0755 libglx.so.$VERSION /usr/lib/xorg/modules/extensions &&
-
- mkdir -p /usr/share/{applications,doc/NVIDIA_GLX-1.0/html} &&
- install -m0444 html/* /usr/share/doc/NVIDIA_GLX-1.0/html &&
-
- install -m0444 README.txt LICENSE NVIDIA_Changelog /usr/share/doc/NVIDIA_GLX-1.0 &&
- install -m0444 nvidia-xconfig.1.gz nvidia-smi.1.gz nvidia-installer.1.gz /usr/share/man/man1 &&
-
- # Register Nvidia XvMC library for use in any XvMC enabled media player
- install -m644 XvMCConfig /etc/X11 &&
-
- install -Dm644 $SCRIPT_DIRECTORY/50-nvidia.conf /usr/share/X11/xorg.conf.d/50-nvidia.conf &&
-
- if in_depends $MODULE "gtk+-2" ; then
- install -m0755 nvidia-settings /usr/bin &&
- install -m0444 nvidia-settings-$VERSION/doc/nvidia-settings.desktop /usr/share/applications &&
- install -m0444 nvidia-settings-$VERSION/doc/nvidia-settings.png /usr/share/doc/NVIDIA_GLX-1.0 &&
- install -m0444 nvidia-settings.1.gz /usr/share/man/man1
- fi
-
-) > $C_FIFO 2>&1
+fi &&
+
+# Builds nvidia-xconfig from source
+cd nvidia-xconfig-$VERSION &&
+make clean &&
+make &&
+install -m 755 _out/Linux_x86/nvidia-xconfig .. &&
+install -m 644 _out/Linux_x86/nvidia-xconfig.1.gz .. &&
+cd .. &&
+
+# We make the kernel modules on our own
+cd kernel &&
+sedit "s@\$\(shell uname -r\)@`cat /usr/src/linux/include/config/kernel.release`@" Makefile.* makefile &&
+make module &&
+rm -f $SOURCE_DIRECTORY/{libGL.so,libGLcore.so.1,libnvidia-tls.so.1} &&
+
+prepare_install &&
+
+make install &&
+cd .. &&
+
+mkdir -p /etc/OpenCL/vendors &&
+install -m0444 nvidia.icd /etc/OpenCL/vendors &&
+install -m0755 nvidia-bug-report.sh /usr/bin &&
+install -m0755 nvidia-installer /usr/bin &&
+install -m0755 nvidia-smi /usr/bin &&
+ln -sf /usr/bin/nvidia-installer /usr/bin/nvidia-uninstall &&
+install -m0755 nvidia-xconfig /usr/bin &&
+
+install -m0755 libnv*.so.$VERSION /usr/lib &&
+ln -sf /usr/lib/libnvidia-cfg.so.$VERSION /usr/lib/libnvidia-cfg.so.1 &&
+ln -sf /usr/lib/libnvidia-cfg.so.1 /usr/lib/libnvidia-cfg.so &&
+
+install -m0755 libcuda.so.$VERSION /usr/lib &&
+ln -sf /usr/lib/libcuda.so.$VERSION /usr/lib/libcuda.so.1 &&
+ln -sf /usr/lib/libcuda.so.1 /usr/lib/libcuda.so &&
+
+install -m0755 libGL.so.$VERSION /usr/lib &&
+
+install -m0755 libOpenCL.so.1.0.0 /usr/lib &&
+ln -sf /usr/lib/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so.1.0 &&
+ln -sf /usr/lib/libOpenCL.so.1.0 /usr/lib/libOpenCL.so.1 &&
+ln -sf /usr/lib/libOpenCL.so.1 /usr/lib/libOpenCL.so &&
+
+mkdir -p /usr/lib/tls &&
+install -m0755 tls/libnvidia-tls.so.$VERSION /usr/lib/tls &&
+
+install -m0755 libvdpau_nvidia.so.$VERSION /usr/lib/vdpau &&
+ln -sf /usr/lib/vdpau/libvdpau_nvidia.so.$VERSION /usr/lib/vdpau/libvdpau_nvidia.so.1 &&
+ln -sf /usr/lib/vdpau/libvdpau_nvidia.so.1 /usr/lib/libvdpau_nvidia.so &&
+
+mkdir -p /usr/lib/xorg/modules/drivers &&
+install -m0755 nvidia_drv.so /usr/lib/xorg/modules/drivers &&
+mkdir -p /usr/lib/xorg/modules/extensions &&
+install -m0755 libglx.so.$VERSION /usr/lib/xorg/modules/extensions &&
+
+mkdir -p /usr/share/{applications,doc/NVIDIA_GLX-1.0/html} &&
+install -m0444 html/* /usr/share/doc/NVIDIA_GLX-1.0/html &&
+
+install -m0444 README.txt LICENSE NVIDIA_Changelog /usr/share/doc/NVIDIA_GLX-1.0 &&
+install -m0444 nvidia-xconfig.1.gz nvidia-smi.1.gz nvidia-installer.1.gz /usr/share/man/man1 &&
+
+# Register Nvidia XvMC library for use in any XvMC enabled media player
+install -m644 XvMCConfig /etc/X11 &&
+
+install -Dm644 $SCRIPT_DIRECTORY/50-nvidia.conf /usr/share/X11/xorg.conf.d/50-nvidia.conf &&
+
+if in_depends $MODULE "gtk+-2" ; then
+ install -m0755 nvidia-settings /usr/bin &&
+ install -m0444 nvidia-settings-$VERSION/doc/nvidia-settings.desktop /usr/share/applications &&
+ install -m0444 nvidia-settings-$VERSION/doc/nvidia-settings.png /usr/share/doc/NVIDIA_GLX-1.0 &&
+ install -m0444 nvidia-settings.1.gz /usr/share/man/man1
+fi
--- /dev/null
+++ b/driver/NVIDIA/BUILD.x86_64
@@ -0,0 +1,126 @@
+
+# Temporary fix for x86_64 with kernel >= 3.10
+patch_it $SOURCE5 1 &&
+
+# Temporary paths and symlinks to make sources compilable
+LD_LIBRARY_PATH="$SOURCE_DIRECTORY:$LD_LIBRARY_PATH" &&
+CFLAGS=" -L$SOURCE_DIRECTORY $CFLAGS " &&
+export SYSSRC=/usr/src/linux &&
+ln -s libGL.so.$VERSION nvidia-installer-$VERSION/libGL.so &&
+ln -s libnvidia-glcore.so.$VERSION nvidia-installer-$VERSION/libGLcore.so.1 &&
+ln -s libnvidia-tls.so.$VERSION nvidia-installer-$VERSION/libnvidia-tls.so.1 &&
+
+echo libXvMCNVIDIA_dynamic.so.1 > XvMCConfig &&
+
+# Builds nvidia-installer from source
+cd nvidia-installer-$VERSION &&
+rm -f *Linux* &&
+
+# Don't compile 32-bits on pure 64-bit Lunar
+sedit 's/COMPAT_32_SRC *= */\0#/' Makefile &&
+sedit 's/-DNV_X86_64//' Makefile &&
+
+make clean &&
+make rebuild_tls_test &&
+make rebuild_tls_test_dso &&
+make rebuild_rtld_test &&
+make &&
+install -m 755 _out/Linux_x86_64/nvidia-installer .. &&
+install -m 755 _out/Linux_x86_64/mkprecompiled .. &&
+install -m 644 _out/Linux_x86_64/nvidia-installer.1.gz .. &&
+cp tls_test_`uname`-x86_64 ../tls_test &&
+cp tls_test_dso_`uname`-x86_64.so ../tls_test_dso.so &&
+cd .. &&
+
+if in_depends $MODULE "gtk+-2" ; then
+ # Builds nvidia-settings from source
+ cd nvidia-settings-$VERSION &&
+
+ # xf86vmode.h has been removed in xf86vidmodeproto 2.3
+ if [[ ! -e /usr/include/X11/extensions/xf86vmode.h ]] ; then
+ sedit "s:#include <X11/extensions/xf86vmode.h>:#include <X11/extensions/xf86vmproto.h>:" src/libXNVCtrlAttributes/NvCtrlAttributes{,VidMode,Glx}.c
+ fi &&
+
+ make clean &&
+ make -C src/libXNVCtrl clean &&
+ make -C src/libXNVCtrl &&
+ make &&
+ install -m 755 src/_out/Linux_x86_64/nvidia-settings .. &&
+ install -m 644 doc/_out/Linux_x86_64/nvidia-settings.1.gz .. &&
+ sedit 's/__UTILS_PATH__/\/usr\/bin/' doc/nvidia-settings.desktop &&
+ sedit 's/__PIXMAP_PATH__/\/usr\/share\/doc\/NVIDIA_GLX-1.0/' doc/nvidia-settings.desktop &&
+ sedit 's/__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__/Settings;DesktopSettings;/' doc/nvidia-settings.desktop &&
+ cd ..
+fi &&
+
+# Builds nvidia-xconfig from source
+cd nvidia-xconfig-$VERSION &&
+make clean &&
+make &&
+install -m 755 _out/Linux_x86_64/nvidia-xconfig .. &&
+install -m 644 _out/Linux_x86_64/nvidia-xconfig.1.gz .. &&
+cd .. &&
+
+# We make the kernel modules on our own
+cd kernel &&
+sedit "s@\$\(shell uname -r\)@`cat /usr/src/linux/include/config/kernel.release`@" Makefile.* makefile &&
+make module &&
+rm -f $SOURCE_DIRECTORY/{libGL.so,libGLcore.so.1,libnvidia-tls.so.1} &&
+
+prepare_install &&
+
+make install &&
+cd .. &&
+
+mkdir -p /etc/OpenCL/vendors &&
+install -m0444 nvidia.icd /etc/OpenCL/vendors &&
+install -m0755 nvidia-bug-report.sh /usr/bin &&
+install -m0755 nvidia-installer /usr/bin &&
+install -m0755 nvidia-smi /usr/bin &&
+ln -sf /usr/bin/nvidia-installer /usr/bin/nvidia-uninstall &&
+install -m0755 nvidia-xconfig /usr/bin &&
+
+install -m0755 libnv*.so.$VERSION /usr/lib &&
+ln -sf /usr/lib/libnvidia-cfg.so.$VERSION /usr/lib/libnvidia-cfg.so.1 &&
+ln -sf /usr/lib/libnvidia-cfg.so.1 /usr/lib/libnvidia-cfg.so &&
+
+install -m0755 libcuda.so.$VERSION /usr/lib &&
+ln -sf /usr/lib/libcuda.so.$VERSION /usr/lib/libcuda.so.1 &&
+ln -sf /usr/lib/libcuda.so.1 /usr/lib/libcuda.so &&
+
+install -m0755 libGL.so.$VERSION /usr/lib &&
+
+install -m0755 libOpenCL.so.1.0.0 /usr/lib &&
+ln -sf /usr/lib/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so.1.0 &&
+ln -sf /usr/lib/libOpenCL.so.1.0 /usr/lib/libOpenCL.so.1 &&
+ln -sf /usr/lib/libOpenCL.so.1 /usr/lib/libOpenCL.so &&
+
+mkdir -p /usr/lib/tls &&
+install -m0755 tls/libnvidia-tls.so.$VERSION /usr/lib/tls &&
+
+install -m0755 libvdpau_nvidia.so.$VERSION /usr/lib/vdpau &&
+ln -sf /usr/lib/vdpau/libvdpau_nvidia.so.$VERSION /usr/lib/vdpau/libvdpau_nvidia.so.1 &&
+ln -sf /usr/lib/vdpau/libvdpau_nvidia.so.1 /usr/lib/libvdpau_nvidia.so &&
+
+mkdir -p /usr/lib/xorg/modules/drivers &&
+install -m0755 nvidia_drv.so /usr/lib/xorg/modules/drivers &&
+mkdir -p /usr/lib/xorg/modules/extensions &&
+install -m0755 libglx.so.$VERSION /usr/lib/xorg/modules/extensions &&
+
+mkdir -p /usr/share/{applications,doc/NVIDIA_GLX-1.0/html} &&
+install -m0444 html/* /usr/share/doc/NVIDIA_GLX-1.0/html &&
+
+install -m0444 README.txt LICENSE NVIDIA_Changelog /usr/share/doc/NVIDIA_GLX-1.0 &&
+install -m0444 nvidia-xconfig.1.gz nvidia-smi.1.gz nvidia-installer.1.gz /usr/share/man/man1 &&
+
+# Register Nvidia XvMC library for use in any XvMC enabled media player
+install -m644 XvMCConfig /etc/X11 &&
+
+install -Dm644 $SCRIPT_DIRECTORY/50-nvidia.conf /usr/share/X11/xorg.conf.d/50-nvidia.conf &&
+
+if in_depends $MODULE "gtk+-2" ; then
+ install -m0755 nvidia-settings /usr/bin &&
+ install -m0444 nvidia-settings-$VERSION/doc/nvidia-settings.desktop /usr/share/applications &&
+ install -m0444 nvidia-settings-$VERSION/doc/nvidia-settings.png /usr/share/doc/NVIDIA_GLX-1.0 &&
+ install -m0444 nvidia-settings.1.gz /usr/share/man/man1
+fi
--- a/driver/NVIDIA/DETAILS
+++ b/driver/NVIDIA/DETAILS
@@ -1,5 +1,5 @@
MODULE=NVIDIA
- VERSION=319.23
+ VERSION=319.32
SOURCE=NVIDIA-Linux-x86-$VERSION.run
SOURCE2=nvidia-settings-$VERSION.tar.bz2
SOURCE3=nvidia-installer-$VERSION.tar.bz2
@@ -27,14 +27,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION
SOURCE2_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot
SOURCE3_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-installer/snapshot
SOURCE4_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot
- SOURCE_VFY=sha1:8c43b680bb8f62d6a47c9090c1c29948decc493d
- SOURCE2_VFY=sha1:776f60444a27920ee8a38e2edcdd3d79cddea908
- SOURCE3_VFY=sha1:cd779a0014fe253380cc876d1c1d936c294107f5
- SOURCE4_VFY=sha1:f6974912532ea166ee373d88e6c533b8ca9a7cd6
+ SOURCE_VFY=sha1:de8f81181d4e24668b7b941bc203c70371856664
+ SOURCE2_VFY=sha1:9d5c3438e59b29cb65fee5165478bbb8445164bc
+ SOURCE3_VFY=sha1:d99206f2cbeec860c3272909031c4a20c48e2703
+ SOURCE4_VFY=sha1:c166beed85a326ad5bdac2f8eb4568fa01fb56ca
WEB_SITE=http://www.nvidia.com/
LICENSE="proprietary"
ENTERED=20030804
- UPDATED=20130530
+ UPDATED=20130707
SHORT="X11 NVIDIA binary driver for Geforce 6/7/8/9/GT2xx"
cat << EOF
--- a/driver/NVIDIA/PRE_BUILD
+++ b/driver/NVIDIA/PRE_BUILD
@@ -1,11 +1,29 @@
(
+ GCCKNL=`cat /proc/version | cut -d\( -f3 | cut -d\ -f3`
+ GCCNOW=`gcc --version | grep gcc | cut -d\ -f3`
+ if [ $GCCKNL != $GCCNOW ]; then
+ message "${PROBLEM_COLOR}The kernel is compiled using gcc version: $GCCKNL"
+ message "but you try to compile nvidia kernel module with"
+ message "gcc version: $GCCNOW. You can not use different"
+ message "gcc to build kernel and modules. Please lin kernel"
+ message "with current gcc, then reboot and lin nvidia driver.${DEFAULT_COLOR}"
+ exit 1
+ fi &&
+
cd $BUILD_DIRECTORY &&
rm -rf $SOURCE_DIRECTORY &&
sh $SOURCE_CACHE/$SOURCE -x &&
cd $SOURCE_DIRECTORY &&
unpack $SOURCE2 &&
unpack $SOURCE3 &&
- unpack $SOURCE4
+ unpack $SOURCE4 &&
+
+ # Remove files to avoid module conflicts and
+ # make place for source compiled replacements
+ rm -f .manifest libvdpau.so* libvdpau_trace.so* \
+ pkg-history.txt nvidia-installer{,.*} \
+ mkprecompiled nvidia-xconfig{,.*} nvidia-settings{,.*} \
+ libnvidia-wfb* tls_test* libGL.la gl*.h
)
More information about the Lunar-commits
mailing list