Source Mage code commit list

[Andraž Levstik <scm AT sourcemage.org>]

GIT changes to master z-rejected grimoire by Andraž Levstik 
<ruskie+2054d253 AT codemages.net>:

 z-kernels/ati-fglrx/DETAILS   |    5 ++---
 z-kernels/ati-fglrx/HISTORY   |    5 +++++
 z-kernels/ati-fglrx/INSTALL   |   18 ++++++++++++++----
 z-kernels/ati-fglrx/PRE_BUILD |    2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 42878ebf9f77830862baadbee34f78d9cbd2777b
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    ati-fglrx: update to 9.4 - I only get a black screen with 1.6.1

diff --git a/z-kernels/ati-fglrx/DETAILS b/z-kernels/ati-fglrx/DETAILS
index 566599f..66bb539 100755
--- a/z-kernels/ati-fglrx/DETAILS
+++ b/z-kernels/ati-fglrx/DETAILS
@@ -1,14 +1,13 @@
            SPELL=ati-fglrx
-         VERSION=9.3
+         VERSION=9.4
           SOURCE=ati-driver-installer-${VERSION/./-}-x86.x86_64.run
-     
SOURCE_HASH=sha512:74c3441b44ad58150f1152e4eff713783c03843ec0e0ffd8ae39c654f8e3ef5872524b759e439fd34b66377b60c6f644b31b4d0e44ea574eba1df9e1a47de22d
+     
SOURCE_HASH=sha512:da813e1f1e88da9f7c608b8da2b00e8b451b662e5653cde37900881b14ca940fa94dbc8c92a8876543125250ec2e454cc646a05d80567af9d3acb66f0d93513c
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    
SOURCE_URL[0]=https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/${SOURCE}
 
       LICENSE[0]="$GRIMOIRE/$SECTION/$SPELL/LICENSE"
         WEB_SITE=http://www.ati.com
          ENTERED=20071107
           REJECT="Non-GPL compatible software license"
-      PATCHELEVL=1
            SHORT="X Window display driver for the ATI graphics accelerators"
             DOCS="documentation/*"
 cat << EOF
diff --git a/z-kernels/ati-fglrx/HISTORY b/z-kernels/ati-fglrx/HISTORY
index 0714624..50b94f8 100644
--- a/z-kernels/ati-fglrx/HISTORY
+++ b/z-kernels/ati-fglrx/HISTORY
@@ -1,3 +1,8 @@
+2009-04-23 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * DETAILS: updated spell to 9.4
+       * INSTALL: some fixes
+       * PRE_BUILD: added 1.6
+
 2009-04-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: Fixed SOURCE_URL[0]
          updated spell to 9.3
diff --git a/z-kernels/ati-fglrx/INSTALL b/z-kernels/ati-fglrx/INSTALL
index 974991c..4bf1db7 100755
--- a/z-kernels/ati-fglrx/INSTALL
+++ b/z-kernels/ati-fglrx/INSTALL
@@ -1,8 +1,8 @@
 cd ${SOURCE_DIRECTORY} &&
-local ARCHLIB
+local ARCHLIB ARCH2
 case "${SMGL_COMPAT_ARCHS[1]}" in
-          "ia32") ARCHLIB=lib   ;;
-        "x86_64") ARCHLIB=lib64   ;;
+          "ia32") ARCHLIB=lib ; ARCH2="" ;;
+        "x86_64") ARCHLIB=lib64 ; ARCH2="_64a"  ;;
                *)  message "${PROBLEM_COLOR}" \
                         "Unsupported architecture: ${SMGL_COMPAT_ARCHS[1]}" \
                         "${DEFAULT_COLOR}" &&
@@ -42,6 +42,8 @@ cp -vr usr/X11R6/$ARCHLIB/modules/drivers/* \
 cp -vr usr/X11R6/$ARCHLIB/modules/dri/* \
        $INSTALL_ROOT/usr/lib/xorg/modules/dri/  &&
 rm -rf usr/X11R6/$ARCHLIB/modules/{dri,drivers,extensions,linux}  &&
+mv -v usr/X11R6/$ARCHLIB/modules/*.a \
+       $INSTALL_ROOT/usr/lib/  &&
 cp -vr usr/X11R6/$ARCHLIB/modules/* \
        $INSTALL_ROOT/usr/lib/xorg/modules/  &&
 rm -rf usr/X11R6/$ARCHLIB/modules  &&
@@ -51,13 +53,21 @@ pushd  $INSTALL_ROOT/usr/lib/ati/ &&
 ln -sfv libGL.so.1.2 libGL.so &&
 popd &&
 rm -f usr/X11R6/$ARCHLIB/libGL.so.1.2  &&
-cp -vr usr/X11R6/$ARCHLIB/* \
+pushd usr/X11R6/$ARCHLIB &&
+for lib in * ; do
+cp -vr $lib \
        $INSTALL_ROOT/usr/lib/  &&
+ln -sf $INSTALL_ROOT/usr/lib/$lib $INSTALL_ROOT/usr/lib/${lib/.1.0} &&
+ln -sf $INSTALL_ROOT/usr/lib/$lib $INSTALL_ROOT/usr/lib/${lib/.1}
+done
+popd
 cp -vr usr/X11R6/include/X11/extensions/* \
        $INSTALL_ROOT/usr/include/X11/extensions/  &&
+chmod +x usr/X11R6/bin/* &&
 cp -vr usr/X11R6/bin/* $INSTALL_ROOT/usr/bin/  && 
 cp -vr usr/include/GL/* $INSTALL_ROOT/usr/include/GL/  &&
 cp -vr usr/$ARCHLIB/* $INSTALL_ROOT/usr/lib/  &&
+chmod +x usr/sbin/* &&
 cp -vr usr/sbin/* $INSTALL_ROOT/usr/sbin/  &&
 cp -vr usr/share/man/man8/* $INSTALL_ROOT/usr/share/man/man8/  &&
 cp -vr usr/share/icons/* $INSTALL_ROOT/usr/share/icons/  &&
diff --git a/z-kernels/ati-fglrx/PRE_BUILD b/z-kernels/ati-fglrx/PRE_BUILD
index 9b0ceb4..64dd3c5 100755
--- a/z-kernels/ati-fglrx/PRE_BUILD
+++ b/z-kernels/ati-fglrx/PRE_BUILD
@@ -34,7 +34,7 @@ mkdir build &&
 # Merge files from different source directories to match the system
 cp -R archive/common/* build &&
 
-if grep -q "1.5" <<< $(installed_version xorg-server)
+if grep -E -q "1\.5|1\.6" <<< $(installed_version xorg-server)
 then
   ATI_XVERSION=x740
 else