[Lunar-commits] <moonbase> NVIDIA-fx: updated to 173.14.22 X.Org xserver 1.7 ready !!!

Zbigniew Luszpinski zbiggy at lunar-linux.org
Wed Nov 18 21:16:45 CET 2009 

commit 63d8b339f03e7861edd0bd78e56fd465b2c20cb0
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Wed Nov 18 21:16:45 2009 +0100

    NVIDIA-fx: updated to 173.14.22
    X.Org xserver 1.7 ready !!!
---
 x11/NVIDIA-fx/BUILD          |   21 +++++++++++----------
 x11/NVIDIA-fx/DETAILS        |    6 +++---
 x11/NVIDIA-fx/DETAILS.x86_64 |    6 +++---
 x11/NVIDIA-fx/PRE_BUILD      |    2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/x11/NVIDIA-fx/BUILD b/x11/NVIDIA-fx/BUILD
index baf769d..f171a02 100644
--- a/x11/NVIDIA-fx/BUILD
+++ b/x11/NVIDIA-fx/BUILD
@@ -1,7 +1,9 @@
 (
 
+  cd $SOURCE_DIRECTORY &&
+  rm -f usr/X11R6/lib/modules/libnvidia-wfb* &&
   # We make the kernel modules on our own
-  cd $SOURCE_DIRECTORY/usr/src/nv &&
+  cd usr/src/nv &&
 
   sedit "s:KBUILD_VERBOSE=1:KBUILD_VERBOSE=0:g" Makefile.kbuild &&
 
@@ -21,26 +23,26 @@
   sedit "s/__PIXMAP_PATH__/\/usr\/share\/doc\/NVIDIA_GLX-1.0/" usr/share/applications/nvidia-settings.desktop &&
 
   mkdir -p /usr/lib/opengl/nvidia &&
+  mkdir -p /usr/include/GL/nvidia &&
+  mkdir -p /usr/include/cuda &&
 
   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/lib/opengl/nvidia/ &&
-  cp -f usr/X11R6/lib/modules/lib* /usr/X11/lib/xorg/modules &&
+  cp -f usr/X11R6/lib/lib* /usr/lib &&
   cp -f usr/share/applications/nvidia-settings.desktop /usr/share/applications/nvidia-settings.desktop
   cd /usr/X11/lib/xorg/modules &&
-  ln -sf libnvidia-wfb.so.$VERSION libnvidia-wfb.so.1 &&
 
   cd $SOURCE_DIRECTORY &&
-  cp -rf usr/X11R6/lib/modules/drivers /usr/X11/lib/xorg/modules &&
-  cp -rf usr/X11R6/lib/modules/extensions /usr/X11/lib/xorg/modules &&
+  cp -rf usr/X11R6/lib/modules /usr/X11/lib/xorg &&
   cd /usr/X11/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/cuda /usr/X11/include &&
+  install -m644 usr/include/GL/*.h /usr/include/GL/nvidia &&
+  install -m644 usr/include/cuda/*.h /usr/include/cuda &&
   cp -rf usr/lib/tls /usr/lib/opengl/nvidia/ &&
   cd /usr/lib/opengl/nvidia/tls &&
   ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so.1 &&
@@ -51,14 +53,13 @@
   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 /usr/X11/lib/libXvMCNVIDIA.so.$VERSION /usr/X11/lib/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 &&
@@ -82,7 +83,7 @@
 
   ln -sf /usr/lib/opengl/nvidia/libGLcore.so.1 \
          /usr/lib/libGLcore.so.1 &&
-         
+
   ln -sf /usr/lib/opengl/nvidia/tls/libnvidia-tls.so.1 \
          /usr/lib/libnvidia-tls.so.1
 
diff --git a/x11/NVIDIA-fx/DETAILS b/x11/NVIDIA-fx/DETAILS
index 14031d9..bc0fc79 100644
--- a/x11/NVIDIA-fx/DETAILS
+++ b/x11/NVIDIA-fx/DETAILS
@@ -1,5 +1,5 @@
           MODULE=NVIDIA-fx
-         VERSION=173.14.20
+         VERSION=173.14.22
           SOURCE=NVIDIA-Linux-x86-$VERSION-pkg0.run
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION-pkg0
    SOURCE_URL[0]=ftp://download.nvidia.com/XFree86/Linux-x86/$VERSION/
@@ -20,11 +20,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION-pkg0
   SOURCE_URL[15]=http://it.download.nvidia.com/XFree86/Linux-x86/$VERSION/
   SOURCE_URL[16]=http://br.download.nvidia.com/XFree86/Linux-x86/$VERSION/
   SOURCE_URL[17]=http://la.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-      SOURCE_VFY=sha1:be25da830b9debde96bfcd15cfa9bebb576886a5
+      SOURCE_VFY=sha1:eb12529b586edb2e596054bef0701ae55eda014f
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20090630
+         UPDATED=20091118
            SHORT="X11 NVIDIA binary driver for Geforce FX"
 
 cat << EOF
diff --git a/x11/NVIDIA-fx/DETAILS.x86_64 b/x11/NVIDIA-fx/DETAILS.x86_64
index 7db46ff..f8b56d7 100644
--- a/x11/NVIDIA-fx/DETAILS.x86_64
+++ b/x11/NVIDIA-fx/DETAILS.x86_64
@@ -1,5 +1,5 @@
           MODULE=NVIDIA-fx
-         VERSION=173.14.20
+         VERSION=173.14.22
           SOURCE=NVIDIA-Linux-x86_64-$VERSION-pkg0.run
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-pkg0
    SOURCE_URL[0]=ftp://download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
@@ -20,11 +20,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-pkg0
   SOURCE_URL[15]=http://it.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
   SOURCE_URL[16]=http://br.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
   SOURCE_URL[17]=http://la.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-      SOURCE_VFY=sha1:f77de1cd22e5c1da47b3ffb5e776b26c180ac218
+      SOURCE_VFY=sha1:d81c01d10317fb4762d80e6fc3dea01e43720780
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20090630
+         UPDATED=20091118
            SHORT="X11 NVIDIA binary driver for Geforce FX"
 
 cat << EOF
diff --git a/x11/NVIDIA-fx/PRE_BUILD b/x11/NVIDIA-fx/PRE_BUILD
index aa47872..22c3ee2 100644
--- a/x11/NVIDIA-fx/PRE_BUILD
+++ b/x11/NVIDIA-fx/PRE_BUILD
@@ -2,6 +2,6 @@
 
   cd $BUILD_DIRECTORY       &&
   rm -rf $SOURCE_DIRECTORY  &&
-  sh $SOURCE_CACHE/$SOURCE --extract-only
+  sh $SOURCE_CACHE/$SOURCE  -x
 
 )

More information about the Lunar-commits mailing list