[Lunar-commits] <moonbase> fglrx: Adjusting the BUILD.x86_64. Running /usr/bin/amdcccle would give an

[Dennis 'stumbles' Veatch]

commit bd007580aa6adb6a5ee1c07e804e23e4730b677c
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Thu Jan 29 20:26:00 2009 -0500

    fglrx: Adjusting the BUILD.x86_64. Running /usr/bin/amdcccle would give an
    error that fglrx was not properly installed. This takes care of that, it's
    just the BUILD adjusted for lib64. One thing I am not sure what to do about,
    is the md5sum errors on libdri.so, and libglx.so. Right now it happens on
    xorg-server.
---
 x11/fglrx/BUILD.x86_64 |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/x11/fglrx/BUILD.x86_64 b/x11/fglrx/BUILD.x86_64
index 94d1bce..22fb97d 100644
--- a/x11/fglrx/BUILD.x86_64
+++ b/x11/fglrx/BUILD.x86_64
@@ -60,22 +60,25 @@
 
   mkdir -p /usr/X11/lib/dri &&
 
-  cp -af arch/x86_64/usr/X11R6/lib64/lib* /usr/X11/lib/xorg/ &&
+  # We need a special location for the libaries
+  mkdir -p /usr/lib/opengl/ati &&
+
+  cp -af arch/x86_64/usr/X11R6/lib64/lib* /usr/lib/opengl/ati/ &&
   cp -af arch/x86_64/usr/X11R6/lib64/modules/dri/fglrx_dri.so \
-         /usr/X11/lib/dri/ &&
+         /usr/X11/lib/dri &&
 
   # Setup symlinks
-  ln -sf /usr/X11/lib/xorg/libGL.so.1.2 \
-         /usr/X11/lib/libGL.so.1 &&
+  ln -sf /usr/lib/opengl/ati/libGL.so.1.2 \
+         /usr/lib/opengl/ati/libGL.so.1 &&
 
-  ln -sf /usr/X11/lib/xorg/libGL.so.1.2 \
-         /usr/X11/lib/libGL.so &&
+  ln -sf /usr/lib/opengl/ati/libGL.so.1.2 \
+         /usr/lib/opengl/ati/libGL.so &&
 
   unset file
 
   for file in libfglrx_dm libfglrx_gamma libfglrx_pp libfglrx_tvout ; do
-    ln -sf /usr/X11/lib/xorg/${file}.so.1.0 \
-          /usr/X11/lib/xorg/${file}.so.1
+    ln -sf /usr/lib/opengl/ati/${file}.so.1.0 \
+          /usr/lib/opengl/ati/${file}.so.1
   done &&
 
   cp -af x740_64a/usr/X11R6/lib64/modules /usr/X11/lib/xorg/ &&
@@ -85,7 +88,12 @@
 
   mkdir -p /lib/modules/${KVER}/drivers/char/drm &&
   install -m644 common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko \
-          /lib/modules/${KVER}/drivers/char/drm/fglrx.ko &&
+          /lib/modules/${KVER}/drivers/char/drm/ &&
+
+  # Get a sane default if haven't set it yet
+  if [ "x$LUNAR_GL" == "x" ] ; then
+    set_local_config LUNAR_GL binary
+  fi
 
   #Update module dependencies
   depmod