[Lunar-commits] <moonbase> NVIDIA: updated to 260.19.12 Fixed some install issues when installing before Xorg

Zbigniew Luszpinski zbiggy at lunar-linux.org
Sun Oct 17 01:43:41 CEST 2010 

commit 4b17500e839102f4ad40026d5cf8f8a68861accc
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat Oct 16 23:43:41 2010 +0000

    NVIDIA: updated to 260.19.12
    Fixed some install issues when installing before Xorg
---
 x11/NVIDIA/BUILD          |   17 ++++++-----------
 x11/NVIDIA/DEPENDS        |    1 +
 x11/NVIDIA/DETAILS        |   22 ++++++++++------------
 x11/NVIDIA/DETAILS.x86_64 |   20 +++++++++-----------
 4 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/x11/NVIDIA/BUILD b/x11/NVIDIA/BUILD
index 971a820..787fadf 100644
--- a/x11/NVIDIA/BUILD
+++ b/x11/NVIDIA/BUILD
@@ -15,19 +15,19 @@
   # Remove files to avoid module conflicts and
   # make place for source compiled replacements
   rm -f .manifest libvdpau.so* libvdpau_trace.so* \
-  vdpau*.h pkg-history.txt nvidia-installer{,.*} \
+  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=" -I$SOURCE_DIRECTORY -L$SOURCE_DIRECTORY $CFLAGS " &&
+  CFLAGS=" -L$SOURCE_DIRECTORY $CFLAGS " &&
   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* &&
@@ -102,7 +102,7 @@
 # NV_VERBOSE=0 EXTRA_CFLAGS=$CFLAGS ARCH=
   make SYSSRC=`readlink /usr/src/linux` module &&
   rm -f $SOURCE_DIRECTORY/{libGL.so,libGLcore.so.1,libnvidia-tls.so.1} &&
- 
+
   prepare_install &&
 
   make SYSSRC=`readlink /usr/src/linux` install &&
@@ -118,13 +118,7 @@
   ln -sf  /usr/bin/nvidia-installer /usr/bin/nvidia-uninstall &&
   install -m0755 nvidia-xconfig /usr/bin &&
 
-  mkdir -p /usr/include/CL &&
-  install -m0444 cl*.h /usr/include/CL &&
-
-  mkdir -p /usr/include/cuda &&
-  install -m0444 cuda*.h /usr/include/cuda &&
-
-  install -m0755 libnvidia-*.so.$VERSION /usr/lib &&
+  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 &&
 
@@ -153,6 +147,7 @@
 
   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 &&
diff --git a/x11/NVIDIA/DEPENDS b/x11/NVIDIA/DEPENDS
index 6e26e11..936fc26 100644
--- a/x11/NVIDIA/DEPENDS
+++ b/x11/NVIDIA/DEPENDS
@@ -3,3 +3,4 @@ depends ncurses
 depends libXxf86vm
 depends libvdpau
 depends gtk+-2
+depends CUDA-OpenCL-headers
diff --git a/x11/NVIDIA/DETAILS b/x11/NVIDIA/DETAILS
index 911f3f5..93b8d79 100644
--- a/x11/NVIDIA/DETAILS
+++ b/x11/NVIDIA/DETAILS
@@ -1,5 +1,5 @@
           MODULE=NVIDIA
-         VERSION=256.53
+         VERSION=260.19.12
           SOURCE=NVIDIA-Linux-x86-$VERSION.run
          SOURCE2=nvidia-settings-$VERSION.tar.bz2
          SOURCE3=nvidia-installer-$VERSION.tar.bz2
@@ -21,20 +21,18 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION
   SOURCE_URL[13]=http://kr.download.nvidia.com/XFree86/Linux-x86/$VERSION
   SOURCE_URL[14]=http://ru.download.nvidia.com/XFree86/Linux-x86/$VERSION
   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
-     SOURCE2_URL=http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot
-     SOURCE3_URL=http://cgit.freedesktop.org/~aplattner/nvidia-installer/snapshot
-     SOURCE4_URL=http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot
-      SOURCE_VFY=sha1:ecebed7c07368f6e0fe09aead042e234db0ac559
-     SOURCE2_VFY=sha1:384c86014403037f6f1caa5be97dae5061abfca0
-     SOURCE3_VFY=sha1:73b8f0c05bae0a7931a72c1bee0384fb94762ec6
-     SOURCE4_VFY=sha1:b7607bf0c5539b77a679befc5c78b23fe215cbb4
+     SOURCE2_URL=ftp://download.nvidia.com/XFree86/nvidia-settings
+     SOURCE3_URL=ftp://download.nvidia.com/XFree86/nvidia-installer
+     SOURCE4_URL=ftp://download.nvidia.com/XFree86/nvidia-xconfig
+      SOURCE_VFY=sha1:9738629d6c707c252ff57138a03edfcb94d978fb
+     SOURCE2_VFY=sha1:ae206e8a406c94a426235d6c96bdf3f88024dde3
+     SOURCE3_VFY=sha1:45c3fe5a01ea48bab27bffa17045cadea08ecd75
+     SOURCE4_VFY=sha1:1fc4ead3a16055bf9fc5abd95cc81418d6e9230b
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20100905
-           SHORT="X11 NVIDIA binary beta driver for Geforce 6/7/8/9/GT2xx"
+         UPDATED=20101015
+           SHORT="X11 NVIDIA binary driver for Geforce 6/7/8/9/GT2xx"
 KEEP_SOURCE=on
 cat << EOF
 These are the nvidia provided binary X11 drivers for their graphics
diff --git a/x11/NVIDIA/DETAILS.x86_64 b/x11/NVIDIA/DETAILS.x86_64
index 01c4ba8..1b38cf7 100644
--- a/x11/NVIDIA/DETAILS.x86_64
+++ b/x11/NVIDIA/DETAILS.x86_64
@@ -1,5 +1,5 @@
           MODULE=NVIDIA
-         VERSION=256.53
+         VERSION=260.19.12
           SOURCE=NVIDIA-Linux-x86_64-$VERSION-no-compat32.run
          SOURCE2=nvidia-settings-$VERSION.tar.bz2
          SOURCE3=nvidia-installer-$VERSION.tar.bz2
@@ -21,19 +21,17 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-no-compat32
   SOURCE_URL[13]=http://kr.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
   SOURCE_URL[14]=http://ru.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
   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
-     SOURCE2_URL=http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot
-     SOURCE3_URL=http://cgit.freedesktop.org/~aplattner/nvidia-installer/snapshot
-     SOURCE4_URL=http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot
-      SOURCE_VFY=sha1:5a7133a19337b9bc5a77b9f56e8d3929ad4420cd
-     SOURCE2_VFY=sha1:384c86014403037f6f1caa5be97dae5061abfca0
-     SOURCE3_VFY=sha1:73b8f0c05bae0a7931a72c1bee0384fb94762ec6
-     SOURCE4_VFY=sha1:b7607bf0c5539b77a679befc5c78b23fe215cbb4
+     SOURCE2_URL=ftp://download.nvidia.com/XFree86/nvidia-settings
+     SOURCE3_URL=ftp://download.nvidia.com/XFree86/nvidia-installer
+     SOURCE4_URL=ftp://download.nvidia.com/XFree86/nvidia-xconfig
+      SOURCE_VFY=sha1:aebaee1702dd33fd1e8f4de3c801e2ee01dcc17e
+     SOURCE2_VFY=sha1:ae206e8a406c94a426235d6c96bdf3f88024dde3
+     SOURCE3_VFY=sha1:45c3fe5a01ea48bab27bffa17045cadea08ecd75
+     SOURCE4_VFY=sha1:1fc4ead3a16055bf9fc5abd95cc81418d6e9230b
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20100905
+         UPDATED=20101015
            SHORT="X11 NVIDIA binary driver for Geforce 6/7/8/9/GT2xx"
 
 cat << EOF

More information about the Lunar-commits mailing list