[Lunar-commits] <moonbase> NVIDIA-beta: updated to 185.19 build script rewritten.

Zbigniew Luszpinski zbiggy at lunar-linux.org
Tue Apr 7 02:37:20 CEST 2009 

commit 26453c6a7dcf42cebee29415476439ac7119beb1
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Tue Apr 7 02:37:20 2009 +0200

    NVIDIA-beta: updated to 185.19
    build script rewritten.
---
 x11/NVIDIA-beta/BUILD          |   34 +++++++++++++++-------------------
 x11/NVIDIA-beta/DETAILS        |    6 +++---
 x11/NVIDIA-beta/DETAILS.x86_64 |    6 +++---
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/x11/NVIDIA-beta/BUILD b/x11/NVIDIA-beta/BUILD
index bfbe919..7b87784 100644
--- a/x11/NVIDIA-beta/BUILD
+++ b/x11/NVIDIA-beta/BUILD
@@ -26,43 +26,39 @@
   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/share/applications/nvidia-settings.desktop /usr/share/applications/nvidia-settings.desktop
+  cp -f usr/X11R6/lib/lib* /usr/lib &&
+  cp -rf usr/X11R6/lib/modules /usr/X11/lib/xorg &&
+
   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 &&
   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 &&
-  cp -rf usr/lib/tls /usr/lib/opengl/nvidia/ &&
-  cd /usr/lib/opengl/nvidia/tls &&
+  cp -rf usr/include/vdpau /usr/X11/include &&
+  cp -rf usr/include/GL /usr/share/doc/NVIDIA_GLX-1.0 &&
+  cp -rf usr/lib/tls /usr/lib &&
+  cd /usr/lib/tls &&
   ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so.1 &&
 
   cd $SOURCE_DIRECTORY &&
-  cp -f usr/lib/lib* /usr/lib/opengl/nvidia/ &&
+  cp -f usr/lib/libGL* /usr/lib/opengl/nvidia/ &&
   cd /usr/lib/opengl/nvidia &&
   ln -sf libGL.so.$VERSION libGL.so.1 &&
   ln -sf libGL.so.1 libGL.so &&
   ln -sf libGLcore.so.$VERSION libGLcore.so.1 &&
+  cd /usr/lib &&
   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  -f usr/lib/lib*a*.* /usr/lib &&
+  cp -rf usr/share/applications /usr/share &&
+  cp -rf usr/share/doc/* /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 &&
 
@@ -70,7 +66,7 @@
   rm -f /etc/X11/XvMCConfig &&
   touch /etc/X11/XvMCConfig &&
   echo libXvMCNVIDIA_dynamic.so.1 > /etc/X11/XvMCConfig &&
-  chmod 644 /etc/X11/XvMCConfig
+  chmod 644 /etc/X11/XvMCConfig &&
 
   # Get a sane default if haven't set it yet
   if [ "x$LUNAR_GL" == "x" ] ; then
@@ -82,8 +78,8 @@
 
   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 \
+
+  ln -sf /usr/lib/tls/libnvidia-tls.so.1 \
          /usr/lib/libnvidia-tls.so.1
 
 ) > $C_FIFO 2>&1
diff --git a/x11/NVIDIA-beta/DETAILS b/x11/NVIDIA-beta/DETAILS
index dc32061..89033ba 100644
--- a/x11/NVIDIA-beta/DETAILS
+++ b/x11/NVIDIA-beta/DETAILS
@@ -1,5 +1,5 @@
           MODULE=NVIDIA-beta
-         VERSION=185.13
+         VERSION=185.19
           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:05f053cf849d3e0776fd6b30863f72b0ceae84e1
+      SOURCE_VFY=sha1:837bdfdf9d0cedeb23256439713a0cbfd9189087
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20090315
+         UPDATED=20090406
            SHORT="X11 NVIDIA binary beta driver for Geforce 6/7/8/9/GT2xx"
 
 cat << EOF
diff --git a/x11/NVIDIA-beta/DETAILS.x86_64 b/x11/NVIDIA-beta/DETAILS.x86_64
index f7cd336..49e614f 100644
--- a/x11/NVIDIA-beta/DETAILS.x86_64
+++ b/x11/NVIDIA-beta/DETAILS.x86_64
@@ -1,5 +1,5 @@
           MODULE=NVIDIA-beta
-         VERSION=185.13
+         VERSION=185.19
           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:547914210d7519eb146f85f29684de9cf1773f40
+      SOURCE_VFY=sha1:4a2032243a69494109662138e60a1be9a8fec103
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20090315
+         UPDATED=20090406
            SHORT="X11 NVIDIA binary driver for Geforce 6/7/8/9/GT2xx"
 
 cat << EOF

More information about the Lunar-commits mailing list