[Lunar-commits] <moonbase-xorg> NVIDIA: Version bumped to 310.19

Stefan Wold ratler at lunar-linux.org
Wed Jan 2 20:54:31 CET 2013 

commit aa6600ef3f271de935e4550b385070184d2a0bee
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 15 Dec 2012 10:07:59 -0800
URL: https://github.com/lunar-linux/moonbase-xorg/commit/aa6600ef3f271de935e4550b385070184d2a0bee

NVIDIA: Version bumped to 310.19

- Removed the use of AVERSION variable
- Minor other BUILD fixes
---
  driver/NVIDIA/BUILD          | +13/-17   
  driver/NVIDIA/DETAILS        | +9/-10    
  driver/NVIDIA/DETAILS.x86_64 | +9/-10    
  3 files changed, 31 insertions(+), 37 deletions(-)

--- a/driver/NVIDIA/BUILD
+++ b/driver/NVIDIA/BUILD
@@ -25,14 +25,14 @@
   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-$AVERSION/libGL.so &&
-  ln -s libnvidia-glcore.so.$VERSION nvidia-installer-$AVERSION/libGLcore.so.1 &&
-  ln -s libnvidia-tls.so.$VERSION nvidia-installer-$AVERSION/libnvidia-tls.so.1 &&
+  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-$AVERSION &&
+  cd nvidia-installer-$VERSION &&
   rm -f *Linux* &&
 
   if [[ $(arch) == x86_64 ]] ; then
@@ -63,7 +63,7 @@
   cd ..
   if in_depends $MODULE "gtk+-2" ; then
     # Builds nvidia-settings from source
-    cd nvidia-settings-$AVERSION &&
+    cd nvidia-settings-$VERSION &&
 
     # xf86vmode.h has been removed in xf86vidmodeproto 2.3
     if [[ ! -e /usr/include/X11/extensions/xf86vmode.h ]] ; then
@@ -71,15 +71,16 @@
     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 _out/Linux_x86_64/nvidia-settings .. &&
-      install -m 644 _out/Linux_x86_64/nvidia-settings.1.gz ..
+      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 _out/Linux_x86/nvidia-settings .. &&
-      install -m 644 _out/Linux_x86/nvidia-settings.1.gz ..
+      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 &&
@@ -88,7 +89,7 @@
   fi &&
 
   # Builds nvidia-xconfig from source
-  cd nvidia-xconfig-$AVERSION &&
+  cd nvidia-xconfig-$VERSION &&
   make clean &&
   make &&
   if [[ $(arch) == x86_64 ]] ; then
@@ -126,11 +127,6 @@
   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 libXvMCNVIDIA.so.$VERSION /usr/lib &&
-  install -m0444 libXvMCNVIDIA.a /usr/lib &&
-  ln -sf /usr/lib/libXvMCNVIDIA.so.$VERSION /usr/lib/libXvMCNVIDIA_dynamic.so.1 &&
-  ln -sf /usr/lib/libXvMCNVIDIA_dynamic.so.1 /usr/lib/libXvMCNVIDIA_dynamic.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 &&
@@ -167,8 +163,8 @@
 
   if in_depends $MODULE "gtk+-2" ; then
     install -m0755 nvidia-settings /usr/bin &&
-    install -m0444 nvidia-settings-$AVERSION/doc/nvidia-settings.desktop /usr/share/applications &&
-    install -m0444 nvidia-settings-$AVERSION/doc/nvidia-settings.png /usr/share/doc/NVIDIA_GLX-1.0 &&
+    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,10 +1,9 @@
           MODULE=NVIDIA
-         VERSION=295.59
-        AVERSION=$VERSION
+         VERSION=310.19
           SOURCE=NVIDIA-Linux-x86-$VERSION.run
-         SOURCE2=nvidia-settings-$AVERSION.tar.bz2
-         SOURCE3=nvidia-installer-$AVERSION.tar.bz2
-         SOURCE4=nvidia-xconfig-$AVERSION.tar.bz2
+         SOURCE2=nvidia-settings-$VERSION.tar.bz2
+         SOURCE3=nvidia-installer-$VERSION.tar.bz2
+         SOURCE4=nvidia-xconfig-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION
    SOURCE_URL[0]=ftp://download.nvidia.com/XFree86/Linux-x86/$VERSION
    SOURCE_URL[1]=http://download.nvidia.com/XFree86/Linux-x86/$VERSION
@@ -28,11 +27,11 @@ 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:0936db03eafb0562dfbb1c032d82f71e3e9abe8c
-     SOURCE2_VFY=sha1:754b40f574a0c273931855d52f39c746c08b4506
-     SOURCE3_VFY=sha1:0beb6f8300617a0cad41214e3d7034838e486cd3
-     SOURCE4_VFY=sha1:062aba1dbec9bd84516fad384e73a2e60f34b71d
-        WEB_SITE=http://www.nvidia.com
+      SOURCE_VFY=sha1:f2313ae5ab69cb503bc164dc7eeab774080b60ee
+     SOURCE2_VFY=sha1:791545d21e3ac4f13eb638ae3a260fc2b4ce055c
+     SOURCE3_VFY=sha1:df75e08628f7efd3305cb0ff7c063a1d57001aca
+     SOURCE4_VFY=sha1:d14110bd2dd0a0a30121b61bc5958b5ea2768c35
+        WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
          UPDATED=20120616
--- a/driver/NVIDIA/DETAILS.x86_64
+++ b/driver/NVIDIA/DETAILS.x86_64
@@ -1,10 +1,9 @@
           MODULE=NVIDIA
-         VERSION=295.59
-        AVERSION=$VERSION
+         VERSION=310.19
           SOURCE=NVIDIA-Linux-x86_64-$VERSION-no-compat32.run
-         SOURCE2=nvidia-settings-$AVERSION.tar.bz2
-         SOURCE3=nvidia-installer-$AVERSION.tar.bz2
-         SOURCE4=nvidia-xconfig-$AVERSION.tar.bz2
+         SOURCE2=nvidia-settings-$VERSION.tar.bz2
+         SOURCE3=nvidia-installer-$VERSION.tar.bz2
+         SOURCE4=nvidia-xconfig-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-no-compat32
    SOURCE_URL[0]=ftp://download.nvidia.com/XFree86/Linux-x86_64/$VERSION
    SOURCE_URL[0]=http://download.nvidia.com/XFree86/Linux-x86_64/$VERSION
@@ -28,14 +27,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-no-compat32
   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:ba0a43f206e9b963481a685972410ba85df9e23a
-     SOURCE2_VFY=sha1:754b40f574a0c273931855d52f39c746c08b4506
-     SOURCE3_VFY=sha1:0beb6f8300617a0cad41214e3d7034838e486cd3
-     SOURCE4_VFY=sha1:062aba1dbec9bd84516fad384e73a2e60f34b71d
+      SOURCE_VFY=sha1:06d067a3479f508732454afa2500ce9fe7d842b2
+     SOURCE2_VFY=sha1:791545d21e3ac4f13eb638ae3a260fc2b4ce055c
+     SOURCE3_VFY=sha1:df75e08628f7efd3305cb0ff7c063a1d57001aca
+     SOURCE4_VFY=sha1:e947ef017760878b1be1d4bd7cacf3fb7936dfc1
         WEB_SITE=http://www.nvidia.com
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20120616
+         UPDATED=20121201
            SHORT="X11 NVIDIA binary driver for Geforce 6/7/8/9/GT2xx"
 
 cat << EOF

More information about the Lunar-commits mailing list