[Lunar-commits] <moonbase> NVIDIA-beta: updated to 256.53 * fixed build on 64bit Lunar * fixed build on fresh Lunar install 32/64bit * compile from source everything possible * do not install *.la file

[Zbigniew Luszpinski]

commit 563cf94bca2c0e0b3fa0359d1b9ddd3b12743fb5
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Mon Sep 6 03:03:36 2010 +0200

    NVIDIA-beta: updated to 256.53
    * fixed build on 64bit Lunar
    * fixed build on fresh Lunar install 32/64bit
    * compile from source everything possible
    * do not install *.la file
---
 x11/NVIDIA-beta/BUILD          |   21 +++++++--------------
 x11/NVIDIA-beta/DETAILS        |   12 ++++++------
 x11/NVIDIA-beta/DETAILS.x86_64 |   12 ++++++------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/x11/NVIDIA-beta/BUILD b/x11/NVIDIA-beta/BUILD
index 847a789..15fab63 100644
--- a/x11/NVIDIA-beta/BUILD
+++ b/x11/NVIDIA-beta/BUILD
@@ -6,14 +6,14 @@
   rm -f .manifest libvdpau.so* libvdpau_trace.so* \
   vdpau*.h pkg-history.txt nvidia-installer{,.*} \
   mkprecompiled nvidia-xconfig{,.*} nvidia-settings{,.*} \
-  libnvidia-wfb* tls_test* &&
+  libnvidia-wfb* tls_test* libGL.la &&
 
   # Temporary paths and symlinks to make sources compilable
   LD_LIBRARY_PATH="$SOURCE_DIRECTORY:$LD_LIBRARY_PATH" &&
   CFLAGS=" -I$SOURCE_DIRECTORY -L$SOURCE_DIRECTORY $CFLAGS " &&
-  ln -s libGL.so.$VERSION libGL.so &&
-  ln -s libnvidia-glcore.so.$VERSION libGLcore.so.1 &&
-  ln -s libnvidia-tls.so.$VERSION 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 &&
   mkdir GL &&
   cp gl*.h GL &&
 
@@ -21,21 +21,18 @@
  
   # Builds nvidia-installer from source
   cd nvidia-installer-$VERSION &&
-#  rm -f *Linux* &&
+  rm -f *Linux* &&
 
   if [[ $(arch) == x86_64 ]] ; then
     # Don't compile 32-bits on pure 64-bit Lunar
     sedit 's/COMPAT_32_SRC *= */\0#/' Makefile &&
-    sedit 's/COMPAT_32_SRC *= */\0#/' public.mk &&
-    sedit 's/-DNV_X86_64//' Makefile &&
-    sedit 's/-DNV_X86_64//' public.mk
+    sedit 's/-DNV_X86_64//' Makefile
   fi &&
 
-  sedit 's at -lGL@-I.. -L.. -lGL @' Makefile &&
   make clean &&
   make rebuild_tls_test &&
   make rebuild_tls_test_dso &&
-#  make rebuild_rtld_test &&
+  make rebuild_rtld_test &&
   make &&
   if [[ $(arch) == x86_64 ]] ; then
   install -m 755 _out/Linux_x86_64/nvidia-installer ..
@@ -85,8 +82,6 @@
   install -m 644 _out/Linux_x86/nvidia-xconfig.1.gz ..
   fi &&
   cd .. &&
-  sedit "s/__GENERATED_BY__/nvidia-installer\:\ $VERSION/" libGL.la &&
-  sedit 's/__LIBGL_PATH__/\/usr\/lib/' libGL.la &&
   sedit 's/__UTILS_PATH__/\/usr\/bin/' nvidia-settings.desktop &&
   sedit 's/__PIXMAP_PATH__/\/usr\/share\/doc\/NVIDIA_GLX-1.0/' nvidia-settings.desktop &&
   sedit 's/__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__/Settings;DesktopSettings;/' nvidia-settings.desktop &&
@@ -136,7 +131,6 @@
   ln -sf /usr/lib/libcuda.so.$VERSION /usr/lib/libcuda.so.1 &&
   ln -sf /usr/lib/libcuda.so.1 /usr/lib/libcuda.so &&
 
-  install -m0644 libGL.la /usr/lib &&
   install -m0755 libGL.so.$VERSION /usr/lib &&
 
   install -m0755 libOpenCL.so.1.0.0 /usr/lib &&
@@ -166,4 +160,3 @@
   install -m644 XvMCConfig /etc/X11
 
 ) > $C_FIFO 2>&1
-
diff --git a/x11/NVIDIA-beta/DETAILS b/x11/NVIDIA-beta/DETAILS
index 26edc55..5e7bdf9 100644
--- a/x11/NVIDIA-beta/DETAILS
+++ b/x11/NVIDIA-beta/DETAILS
@@ -1,5 +1,5 @@
           MODULE=NVIDIA-beta
-         VERSION=256.35
+         VERSION=256.53
           SOURCE=NVIDIA-Linux-x86-$VERSION.run
          SOURCE2=nvidia-settings-$VERSION.tar.bz2
          SOURCE3=nvidia-installer-$VERSION.tar.bz2
@@ -26,14 +26,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-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:7a72704c0fd70bf75126aa962b560bae893b5538
-     SOURCE2_VFY=sha1:f7142501ba4a032becf5ef11305699d2419482e9
-     SOURCE3_VFY=sha1:be9e50c3b9a4e851603c26f8dadac957c45316fe
-     SOURCE4_VFY=sha1:93b326ab9da385a1bf009f26f21b10691cacaf50
+      SOURCE_VFY=sha1:ecebed7c07368f6e0fe09aead042e234db0ac559
+     SOURCE2_VFY=sha1:384c86014403037f6f1caa5be97dae5061abfca0
+     SOURCE3_VFY=sha1:73b8f0c05bae0a7931a72c1bee0384fb94762ec6
+     SOURCE4_VFY=sha1:b7607bf0c5539b77a679befc5c78b23fe215cbb4
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20100619
+         UPDATED=20100905
            SHORT="X11 NVIDIA binary beta driver for Geforce 6/7/8/9/GT2xx"
 KEEP_SOURCE=on
 cat << EOF
diff --git a/x11/NVIDIA-beta/DETAILS.x86_64 b/x11/NVIDIA-beta/DETAILS.x86_64
index b1bb507..56864cd 100644
--- a/x11/NVIDIA-beta/DETAILS.x86_64
+++ b/x11/NVIDIA-beta/DETAILS.x86_64
@@ -1,5 +1,5 @@
           MODULE=NVIDIA-beta
-         VERSION=256.35
+         VERSION=256.53
           SOURCE=NVIDIA-Linux-x86_64-$VERSION-no-compat32.run
          SOURCE2=nvidia-settings-$VERSION.tar.bz2
          SOURCE3=nvidia-installer-$VERSION.tar.bz2
@@ -26,14 +26,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-no-compat32
      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:e8652c7a52f06bc4a1358bcb8d62d48b9d61c6f3
-     SOURCE2_VFY=sha1:f7142501ba4a032becf5ef11305699d2419482e9
-     SOURCE3_VFY=sha1:be9e50c3b9a4e851603c26f8dadac957c45316fe
-     SOURCE4_VFY=sha1:93b326ab9da385a1bf009f26f21b10691cacaf50
+      SOURCE_VFY=sha1:5a7133a19337b9bc5a77b9f56e8d3929ad4420cd
+     SOURCE2_VFY=sha1:384c86014403037f6f1caa5be97dae5061abfca0
+     SOURCE3_VFY=sha1:73b8f0c05bae0a7931a72c1bee0384fb94762ec6
+     SOURCE4_VFY=sha1:b7607bf0c5539b77a679befc5c78b23fe215cbb4
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20100619
+         UPDATED=20100905
            SHORT="X11 NVIDIA binary driver for Geforce 6/7/8/9/GT2xx"
 
 cat << EOF