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/BUILD     |    3 +--
 z-kernels/ati-fglrx/DETAILS   |   10 +++++-----
 z-kernels/ati-fglrx/HISTORY   |    6 ++++++
 z-kernels/ati-fglrx/INSTALL   |   26 +++++++++++++++-----------
 z-kernels/ati-fglrx/PRE_BUILD |    2 +-
 5 files changed, 28 insertions(+), 19 deletions(-)

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

    ati-fglrx: update to 11.11 aka 12.1

diff --git a/z-kernels/ati-fglrx/BUILD b/z-kernels/ati-fglrx/BUILD
index 763d4fe..3fc9816 100755
--- a/z-kernels/ati-fglrx/BUILD
+++ b/z-kernels/ati-fglrx/BUILD
@@ -1,6 +1,5 @@
 # Compile the kernel module
 cd ${SOURCE_DIRECTORY}/build/lib/modules/fglrx/build_mod &&
-cp 2.6.x/Makefile . &&
-make &&
+./make.sh &&
 
 cd ${SOURCE_DIRECTORY}
diff --git a/z-kernels/ati-fglrx/DETAILS b/z-kernels/ati-fglrx/DETAILS
index addfadb..daa439b 100755
--- a/z-kernels/ati-fglrx/DETAILS
+++ b/z-kernels/ati-fglrx/DETAILS
@@ -1,12 +1,12 @@
            SPELL=ati-fglrx
-         VERSION=10.3
-          SOURCE=ati-driver-installer-${VERSION/./-}-x86.x86_64.run
+         VERSION=12.1
+          SOURCE=amd-driver-installer-${VERSION/./-}-x86.x86_64.run
     SOURCE_HINTS="no-check-certificate"
-     
SOURCE_HASH=sha512:3c2e147a88f426fb01cf795b7dba9f29bb5517fd7a345bffcc0b10bdbec0800c2bfa7628bed9bc0cd5daf950c593ea540fca26e223324e33b8c169648080b31b
+     
SOURCE_HASH=sha512:798a30637b7bd03d6ad833c9bb67de04f2c315c0e2d0786b636c095a66c38248994c7a55cb4e7cc86405da5e36f8a520f9e668188876b040e2c9655e4b2a1eb5
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   
SOURCE_URL[0]=https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/${SOURCE}
 
+   SOURCE_URL[0]=http://www2.ati.com/drivers/linux/${SOURCE} 
       LICENSE[0]="$GRIMOIRE/$SECTION/$SPELL/LICENSE"
-        WEB_SITE=http://www.ati.com
+        WEB_SITE=http://www.amd.com
          ENTERED=20071107
           REJECT="Non-GPL compatible software license"
            SHORT="X Window display driver for the ATI graphics accelerators"
diff --git a/z-kernels/ati-fglrx/HISTORY b/z-kernels/ati-fglrx/HISTORY
index 85205ec..752f8d9 100644
--- a/z-kernels/ati-fglrx/HISTORY
+++ b/z-kernels/ati-fglrx/HISTORY
@@ -1,3 +1,9 @@
+2012-01-30 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: fix build
+       * DETAILS: updated to 11.11 aka 12.1
+       * INSTALL: fixed installation
+       * PRE_BUILD: some fixes
+
 2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * INSTALL: fix for gl_select
 
diff --git a/z-kernels/ati-fglrx/INSTALL b/z-kernels/ati-fglrx/INSTALL
index 68f9b84..a440145 100755
--- a/z-kernels/ati-fglrx/INSTALL
+++ b/z-kernels/ati-fglrx/INSTALL
@@ -35,24 +35,22 @@ mkdir -vp $INSTALL_ROOT/usr/share/applications/ \
 cp -vr etc/ati $INSTALL_ROOT/etc/ &&
 cp -vr usr/X11R6/$ARCHLIB/modules/linux/* \
        $INSTALL_ROOT/usr/lib/xorg/modules/linux  &&
-cp -vr usr/X11R6/$ARCHLIB/modules/extensions/* \
-       $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.ati  &&
+cp -vr usr/X11R6/$ARCHLIB/modules/extensions/fglrx/fglrx-libglx.so \
+       $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.ati/libglx.so  &&
 cp -vr usr/X11R6/$ARCHLIB/modules/drivers/* \
        $INSTALL_ROOT/usr/lib/xorg/modules/drivers/  &&
 cp -vr usr/X11R6/$ARCHLIB/modules/dri/* \
        $INSTALL_ROOT/usr/lib/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/* \
+mv -v usr/X11R6/$ARCHLIB/modules/*.so \
        $INSTALL_ROOT/usr/lib/xorg/modules/  &&
 rm -rf usr/X11R6/$ARCHLIB/modules  &&
-cp -vr usr/X11R6/$ARCHLIB/libGL.so.1.2 \
-       $INSTALL_ROOT/usr/lib/.ati/  &&
+cp -vr usr/X11R6/$ARCHLIB/fglrx/fglrx-libGL.so.1.2 \
+       $INSTALL_ROOT/usr/lib/.ati/libGL.so.1.2  &&
 pushd  $INSTALL_ROOT/usr/lib/.ati &&
 ln -sfv libGL.so.1.2 libGL.so &&
 popd &&
-rm -f usr/X11R6/$ARCHLIB/libGL.so.1.2  &&
+rm -rf usr/X11R6/$ARCHLIB/fglrx  &&
 pushd usr/X11R6/$ARCHLIB &&
 for lib in * ; do
 cp -vr $lib \
@@ -60,9 +58,15 @@ cp -vr $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/  &&
+popd &&
+pushd usr/$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 &&
 chmod +x usr/X11R6/bin/* &&
 cp -vr usr/X11R6/bin/* $INSTALL_ROOT/usr/bin/  && 
 cp -vr usr/include/GL/* $INSTALL_ROOT/usr/include/GL/  &&
diff --git a/z-kernels/ati-fglrx/PRE_BUILD b/z-kernels/ati-fglrx/PRE_BUILD
index 1c07492..f3ff13c 100755
--- a/z-kernels/ati-fglrx/PRE_BUILD
+++ b/z-kernels/ati-fglrx/PRE_BUILD
@@ -46,7 +46,7 @@ case "${SMGL_COMPAT_ARCHS[1]}" in
         ;;
         "x86_64")
                 cp -R archive/arch/x86_64/* build &&
-                cp -R archive/x740_64a/* build
+                cp -R archive/xpic_64a/* build
         ;;
                *)
                 message "${PROBLEM_COLOR}" \