[Lunar-commits] r25912 - moonbase/trunk/x11/NVIDIA-beta

[Zbigniew Luszpinski]

Author: zbiggy
Date: 2007-09-20 22:22:31 +0200 (Thu, 20 Sep 2007)
New Revision: 25912

Modified:
   moonbase/trunk/x11/NVIDIA-beta/BUILD
   moonbase/trunk/x11/NVIDIA-beta/CONFLICTS
   moonbase/trunk/x11/NVIDIA-beta/DETAILS
Log:
This is the same module as NVIDIA except it uses my home made installer.
No more binary installer from Nvidia, now we have our own.
This is full replacement for NVIDIA module. Provided for testing.
Works on my machine. YMMV. If you test it and find bugs drop me a message.
Promised - delivered. zbiggy


Modified: moonbase/trunk/x11/NVIDIA-beta/BUILD
===================================================================
--- moonbase/trunk/x11/NVIDIA-beta/BUILD	2007-09-20 19:25:08 UTC (rev 25911)
+++ moonbase/trunk/x11/NVIDIA-beta/BUILD	2007-09-20 20:22:31 UTC (rev 25912)
@@ -1,9 +1,61 @@
 (
 
-  KER_VER=$(readlink /usr/src/linux | cut -d- -f2) &&
+  # We make the kernel modules on our own
+  cd $SOURCE_DIRECTORY/usr/src/nv &&
+
+  sedit "s:KBUILD_VERBOSE=1:KBUILD_VERBOSE=0:g" Makefile.kbuild &&
+
+  make SYSSRC=/usr/src/linux module &&
+
   prepare_install &&
+
+  make SYSSRC=/usr/src/linux install &&
+
   cd $SOURCE_DIRECTORY &&
   rm -rf old.libraries &&
-  ./nvidia-installer -s --no-rpms -N -k$KER_VER --no-recursion --no-x-check
 
+  # This is installer less build script. If you find bugs let me know: zbiggy at o2.pl
+sedit "s/__GENERATED_BY__/nvidia-installer\:\ 1.0.7/" usr/lib/libGL.la &&
+sedit "s/__LIBGL_PATH__/\/usr\/X11R6\/lib/" usr/lib/libGL.la &&
+sedit "s/__UTILS_PATH__/\/usr\/bin/" usr/share/applications/nvidia-settings.desktop &&
+sedit "s/__PIXMAP_PATH__/\/usr\/share\/doc\/NVIDIA_GLX-1.0/" usr/share/applications/nvidia-settings.desktop &&
+cd $SOURCE_DIRECTORY &&
+cp -f nvidia-installer /usr/bin &&
+mkdir -p /usr/share/doc/NVIDIA_GLX-1.0 &&
+cp -f LICENSE /usr/share/doc/NVIDIA_GLX-1.0 &&
+cp -f usr/X11R6/lib/lib* /usr/X11R6/lib &&
+cp -f usr/X11R6/lib/modules/lib* /usr/X11R6/lib/xorg/modules &&
+cp -f usr/share/applications/nvidia-settings.desktop /usr/share/applications/nvidia-settings.desktop
+cd /usr/X11R6/lib/xorg/modules &&
+ln -sf libnvidia-wfb.so.$VERSION libnvidia-wfb.so.1 &&
+cd $SOURCE_DIRECTORY &&
+cp -rf usr/X11R6/lib/modules/drivers /usr/X11R6/lib/xorg/modules &&
+cp -rf usr/X11R6/lib/modules/extensions /usr/X11R6/lib/xorg/modules &&
+cd /usr/X11R6/lib/xorg/modules/extensions &&
+ln -sf libglx.so.$VERSION libglx.so &&
+cd $SOURCE_DIRECTORY &&
+cp -f usr/bin/nvidia* /usr/bin &&
+cp -rf usr/include/GL /usr/X11R6/include &&
+cp -rf usr/lib/tls /usr/X11R6/lib &&
+cd /usr/X11R6/lib/tls &&
+ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so.1 &&
+cd $SOURCE_DIRECTORY &&
+cp -f usr/lib/lib* /usr/X11R6/lib &&
+cd /usr/X11R6/lib &&
+ln -sf libGL.so.$VERSION libGL.so.1 &&
+ln -sf libGL.so.1 libGL.so &&
+ln -sf libGLcore.so.$VERSION libGLcore.so.1 &&
+ln -sf libXvMCNVIDIA.so.$VERSION libXvMCNVIDIA_dynamic.so.1 &&
+ln -sf libnvidia-cfg.so.$VERSION libnvidia-cfg.so.1 &&
+ln -sf libnvidia-cfg.so.1 libnvidia-cfg.so &&
+ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so.1 &&
+cd $SOURCE_DIRECTORY &&
+cp -rf usr/share/doc/html /usr/share/doc/NVIDIA_GLX-1.0 &&
+cp -rf usr/include/GL /usr/share/doc/NVIDIA_GLX-1.0 &&
+cp -f usr/share/doc/NV* /usr/share/doc/NVIDIA_GLX-1.0 &&
+cp -f usr/share/doc/R* /usr/share/doc/NVIDIA_GLX-1.0 &&
+cp -f usr/share/doc/X* /usr/share/doc/NVIDIA_GLX-1.0 &&
+cp -f usr/share/doc/nv* /usr/share/doc/NVIDIA_GLX-1.0 &&
+cp -rf usr/share/man /usr/share &&
+cp -f usr/share/pixmaps/* /usr/share/doc/NVIDIA_GLX-1.0
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/x11/NVIDIA-beta/CONFLICTS
===================================================================
--- moonbase/trunk/x11/NVIDIA-beta/CONFLICTS	2007-09-20 19:25:08 UTC (rev 25911)
+++ moonbase/trunk/x11/NVIDIA-beta/CONFLICTS	2007-09-20 20:22:31 UTC (rev 25912)
@@ -1,4 +1,4 @@
+conflicts NVIDIA-legacy
 conflicts NVIDIA
 conflicts NVIDIA-old
-conflicts NVIDIA-legacy
 conflicts mesa-lib

Modified: moonbase/trunk/x11/NVIDIA-beta/DETAILS
===================================================================
--- moonbase/trunk/x11/NVIDIA-beta/DETAILS	2007-09-20 19:25:08 UTC (rev 25911)
+++ moonbase/trunk/x11/NVIDIA-beta/DETAILS	2007-09-20 20:22:31 UTC (rev 25912)
@@ -1,13 +1,13 @@
           MODULE=NVIDIA-beta
-         VERSION=100.14.11
+         VERSION=100.14.19
           SOURCE=NVIDIA-Linux-x86-$VERSION-pkg0.run
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION-pkg0
       SOURCE_URL=ftp://download.nvidia.com/XFree86/Linux-x86/$VERSION/
-      SOURCE_VFY=sha1:95e101a5b1567bbcce91ce18f48e19d2c344ff05
+      SOURCE_VFY=sha1:d645b21dfd43e0c0640783f2336d51f2e3151353
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20070621
+         UPDATED=20070919
            SHORT="X11 binary drivers provided by NVIDIA for NVIDIA GPUs"
 
 cat << EOF