[Lunar-commits] <moonbase> NVIDIA-beta: synced with NVIDIA

[Zbigniew Luszpinski]

commit 4ead265e5df3ad6b5536aa6881110972952ba4d0
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat Oct 16 23:48:35 2010 +0000

    NVIDIA-beta: synced with NVIDIA
---
 x11/NVIDIA-beta/BUILD        |   11 +++++++++++
 x11/NVIDIA-beta/POST_INSTALL |    5 +++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/x11/NVIDIA-beta/BUILD b/x11/NVIDIA-beta/BUILD
index c71cf17..787fadf 100644
--- a/x11/NVIDIA-beta/BUILD
+++ b/x11/NVIDIA-beta/BUILD
@@ -1,6 +1,17 @@
 (
   # This is installer less build script. If you find bugs let me know by e-mail: zbiggy(0)o2(period)pl
 
+  GCCKNL=`cat /proc/version | cut -d\( -f3 | cut -d\  -f3`
+  GCCNOW=`gcc --version | grep gcc | cut -d\  -f3`
+  if [ $GCCKNL != $GCCNOW ]; then
+  message "${PROBLEM_COLOR}The kernel is compiled using gcc version: $GCCKNL"
+  message "but you try to compile nvidia kernel module with"
+  message "gcc version: $GCCNOW. You can not use different"
+  message "gcc to build kernel and modules. Please lin kernel"
+  message "with current gcc, then reboot and lin nvidia driver.${DEFAULT_COLOR}"
+  exit 1
+  fi &&
+
   # Remove files to avoid module conflicts and
   # make place for source compiled replacements
   rm -f .manifest libvdpau.so* libvdpau_trace.so* \
diff --git a/x11/NVIDIA-beta/POST_INSTALL b/x11/NVIDIA-beta/POST_INSTALL
index f9a0e4c..dbb0b1f 100644
--- a/x11/NVIDIA-beta/POST_INSTALL
+++ b/x11/NVIDIA-beta/POST_INSTALL
@@ -7,7 +7,12 @@ ln -sf libGLcore.so.1 libGLcore.so
 
 # Replace generic libglx from X server by Nvidia's one
 cd /usr/X11/lib/xorg/modules/extensions
+[ ! -h libglx.so ] && mv libglx.so libglx.so.xorg
 ln -sf libglx.so.$VERSION libglx.so
 
 # Clean up
 rm -rf $SOURCE_DIRECTORY
+
+# So this gets fixed when linning xorg-server and NVIDIA;
+# Symbolic link: /usr/lib/xorg/modules/extensions/libglx.so is owned by xorg-server
+lunar fix xorg-server