Source Mage code commit list

[David Kowis <scm AT mail.sourcemage.org>]

GIT changes to master z-rejected grimoire by David Kowis 
<dkowis@melchiah.(none)>:

 ChangeLog                              |    3 +
 z-kernels/ati_driver-new/BUILD         |    8 ++
 z-kernels/ati_driver-new/CONFIGURE     |    1 
 z-kernels/ati_driver-new/CONFLICTS     |    1 
 z-kernels/ati_driver-new/DEPENDS       |    8 ++
 z-kernels/ati_driver-new/DETAILS       |   54 ++++++++++++++++++
 z-kernels/ati_driver-new/FINAL         |    1 
 z-kernels/ati_driver-new/HISTORY       |   99 
+++++++++++++++++++++++++++++++++
 z-kernels/ati_driver-new/INSTALL       |   48 ++++++++++++++++
 z-kernels/ati_driver-new/POST_REMOVE   |    6 ++
 z-kernels/ati_driver-new/PREPARE       |    6 ++
 z-kernels/ati_driver-new/PRE_BUILD     |   13 ++++
 z-kernels/ati_driver-new/TRIGGERS      |    5 +
 z-kernels/ati_driver-new/smgl.qt.patch |   52 +++++++++++++++++
 14 files changed, 305 insertions(+)

New commits:
commit 1b5ec1800ba8779690c698e860e18c6f9b532c3d
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis@melchiah.(none)>

    New Spell: ati_driver-new
    Whoops... forgot the changelog entry

commit 161fc11a2a378fb055326e89916bfa5f7d235274
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis@melchiah.(none)>

    New Spell: ati_driver-new
    
    This will eventually replace the existing ati_driver spell. The author
    desired that it be tested more, so it's not replacing the existing 
ati_driver spell yet.

diff --git a/ChangeLog b/ChangeLog
index 63ecd58..3669842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-11-01 David Kowis <dkowis AT shlrm.org>
+       * z-kernels/ati_driver-new: New ati_driver spell to test
+
 2006-10-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * gurus.gpg: added my sig
 
diff --git a/z-kernels/ati_driver-new/BUILD b/z-kernels/ati_driver-new/BUILD
new file mode 100755
index 0000000..1682e8e
--- /dev/null
+++ b/z-kernels/ati_driver-new/BUILD
@@ -0,0 +1,8 @@
+cd $SOURCE_DIRECTORY/lib/modules/fglrx/build_mod  &&
+sh ./make.sh                                      &&
+if [[ "${ATI_DRIVER_QT}" == "y" ]]
+then
+  cd $SOURCE_DIRECTORY/fglpanel                   &&
+  patch -p0 < ${SCRIPT_DIRECTORY}/smgl.qt.patch   &&
+  make
+fi
diff --git a/z-kernels/ati_driver-new/CONFIGURE 
b/z-kernels/ati_driver-new/CONFIGURE
new file mode 100755
index 0000000..cef20f5
--- /dev/null
+++ b/z-kernels/ati_driver-new/CONFIGURE
@@ -0,0 +1 @@
+config_query ATI_DRIVER_QT "Do you want the firegl control panel (adds a 
dependency on qt-x11)"  n
diff --git a/z-kernels/ati_driver-new/CONFLICTS 
b/z-kernels/ati_driver-new/CONFLICTS
new file mode 100755
index 0000000..da375b8
--- /dev/null
+++ b/z-kernels/ati_driver-new/CONFLICTS
@@ -0,0 +1 @@
+conflicts  ATI_driver  y
diff --git a/z-kernels/ati_driver-new/DEPENDS 
b/z-kernels/ati_driver-new/DEPENDS
new file mode 100755
index 0000000..01eef62
--- /dev/null
+++ b/z-kernels/ati_driver-new/DEPENDS
@@ -0,0 +1,8 @@
+depends  X11-LIBS        &&
+depends  rpmunpack       &&
+depends  bzip2           &&
+depends  smgl-gl_select  &&
+if [[ "${ATI_DRIVER_QT}" == "y" ]]
+then
+   depends qt-x11
+fi
diff --git a/z-kernels/ati_driver-new/DETAILS 
b/z-kernels/ati_driver-new/DETAILS
new file mode 100755
index 0000000..182197a
--- /dev/null
+++ b/z-kernels/ati_driver-new/DETAILS
@@ -0,0 +1,54 @@
+. $GRIMOIRE/FUNCTIONS
+persistent_add ATI_XVER
+persistent_add ATI_ARCH
+local ATI_WWW
+local ATI_FILE
+local ATI_HASH
+           SPELL=ati_driver-new
+         VERSION="${ATI_VERSION:-8.29.6}"
+if [[ ! check_if_xorg_modular_libs ]] &&
+   [[ "$(get_spell_provider $SPELL X11-LIBS)" != "xorg" ]]
+then
+        ATI_XVER=4_3_0
+else
+        ATI_XVER=6_8_0
+fi
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+        ATI_ARCH=x86_64
+         ATI_WWW="64bit/"
+        ATI_FILE=64
+elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
+        ATI_ARCH=i386
+         ATI_WWW=""
+        ATI_FILE=""
+else
+  message "Unsupported architecture ${SMGL_COMPAT_ARCHS[1]}"
+fi
+case "$VERSION $ATI_ARCH $ATI_XVER" in
+   "8.29.6 i386 
6_8_0")SOURCE_HASH=sha512:18630d6eeb5799a466290ae9dbcfdadf03949befa42fdcb62d923afc55b1ffe92e8d13659f2c6f081af3edbc5cfeb62bcff4ac1f10d47913e73a25b242a7bcb1
 ;;
+   "8.29.6 i386 
4_3_0")SOURCE_HASH=sha512:ccab65e5f69cd6796c3ad599c320ab6e9eae61a0f30970026bde59bd043c9996de7ec9bdb98db1e6b8784df8fdd11c84186f0eeefb63499d1cea10a0507a6f5e
 ;;
+ "8.29.6 x86_64 
6_8_0")SOURCE_HASH=sha512:c692c337d1575e04c59330aa14eea606923cf35eff5e94e567abd29652577c54c2360e2e20884001dd92e273f01dcdec46e90a043941d23cae8a0644e79d06d1
 ;;
+ "8.29.6 x86_64 
4_3_0")SOURCE_HASH=sha512:86e2638c5df5d39f80b5029ed010c30dac599150d1f74febe5db54ae723aaa021860c39a3c4e21e29c50246e8b3ea4a86321caf1df2d56b55042ad51e4e0db4e
 ;;
+   "8.28.8 i386 
6_8_0")SOURCE_HASH=sha512:59e64076cc7690235152d3d856bf1b398f43bfebb6e400db48c0932551d1304881296685fc5c41e46092582c51922dd6239bdbfaf47f7986b14afe64841a81e7
 ;;
+   "8.28.8 i386 
4_3_0")SOURCE_HASH=sha512:ba4d9c45c645bb9bc562dbdbb9d780acf00d26c973e42e4e022d07398f1645311058c7707912b96d35d00c2dd4a5d485c88329142c930c33ac92d018975391e2
 ;;
+ "8.28.8 x86_64 
6_8_0")SOURCE_HASH=sha512:37ec5edadb16a6bcbedaab1bf2b465a363d8940286d6fe57b0cfb8ba8cfe19a08de76d0ada7737f85da3bdd19d23a04e6b2e644380160790cabc5c33b0e776c4
 ;;
+ "8.28.8 x86_64 
4_3_0")SOURCE_HASH=sha512:ac04e9b184730ed1bb3203fc45b3819f2640a31010d713e51a9f6d3860558b92e1314b21b577df387114195c020be21beb8980167f3666f55ad8e4570a6bdd2d
 ;;
+                     *) message "Unsupported architecture, version and X 
version"
+esac
+          SOURCE=fglrx${ATI_FILE}_${ATI_XVER}-${VERSION}-1.${ATI_ARCH}.rpm
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=http://www2.ati.com/drivers/linux/${ATI_WWW}${SOURCE}
+        WEB_SITE=http://www.ati.com
+         ENTERED=20030911
+          REJECT="Non-GPL compatible software license"
+      LICENSE[0]="GPL/QPL"
+           SHORT="Driver provided by ATI for Radeon 8500+/FireGL 8700+"
+cat << EOF
+These are the ATI provided binary XFree86 drivers for their graphics cards.
+
+The ATI Proprietary Linux driver currently supports RADEON 8500 and later AGP
+or PCI Express graphics products, as well as FireGL 8700 and later products. 
We
+do not currently plan to include support for any products earlier than this.
+Drivers for earlier products should already be available from the DRI Project
+or Utah-GLX project.
+EOF
diff --git a/z-kernels/ati_driver-new/FINAL b/z-kernels/ati_driver-new/FINAL
new file mode 100755
index 0000000..0a006a7
--- /dev/null
+++ b/z-kernels/ati_driver-new/FINAL
@@ -0,0 +1 @@
+smgl-gl_select -s ati
diff --git a/z-kernels/ati_driver-new/HISTORY 
b/z-kernels/ati_driver-new/HISTORY
new file mode 100644
index 0000000..d03fd12
--- /dev/null
+++ b/z-kernels/ati_driver-new/HISTORY
@@ -0,0 +1,99 @@
+2006-11-1 David Kowis <dkowis AT shlrm.org>
+       * DETAILS: renamed to ati_driver-new
+
+2006-10-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * FINAL: smgl-gl_select properly called now
+       * DEPENDS: fixed typo as well
+
+2006-10-13 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * DETAILS: VERSION UPDATE
+       * BUILD: cleanup
+       * INSTALL: cleanup
+       * PREPARE: added to pick version
+       * POST_REMOVE: added to revert to default GL
+       * DEPENDS: deypend on smgl gl selector
+       * 8.10.19-2.6.11.patch: removed
+       * libstdc++.so.5: removed
+       * PRE_BUILD: cleanup
+       * FINAL: added to pick default GL lib
+
+2006-09-12 Treeve Jelbert <treeve AT pi.be>
+       * DETAILS: version 8.28.8
+
+2006-07-30 Treeve Jelbert <treeve AT pi.be>
+       * DETAILS: version 8.27.10
+       * DEPENDS: add missing &&    and X11-LIBS
+       * BUILD: I don't think that the kernel patch is relevant anymore?
+
+2005-12-01 Seth Woolley <seth AT tautology.org>
+       * DETAILS: MD5 -> SHA512
+
+2005-12-01 Seth Woolley <seth AT tautology.org>
+       * PRE_BUILD: unpack api update
+
+2005-04-05 Eric Sandall <eric AT sandall.us>
+       * BUILD: Apply 2.6.11 patch if needed
+       * 2.6.10-fix.patch: Removed
+       * 8.10.19-2.6.11.patch: Added (patch URL from Andrew Levstik)
+
+2005-04-03 Eric Sandall <eric AT sandall.us>
+       * DETAILS: Reworded SHORT and description to give a little more detail
+         about what this driver is for. Grabbed from:
+         http://www.ati.com/products/catalyst/linux.html
+
+2005-03-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * INSTALL: Permission problems with the spell which broke it
+
+2005-03-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * BUILD: Next time check if patches are still valid sandalle
+         Only commented out the patch leav it in till next update then remove
+       * CONFIGURE: Added the REJECTED_MSG(why is this in CONFIGURE
+         and not in PREPARE???)
+
+2005-03-12 Eric Sandall <eric AT sandall.us>
+       * DETAILS: Updated to 8.10.19
+
+2005-02-09 Eric Sandall <eric AT sandall.us>
+       * CONFIGURE: Added closing parenthesis. :)
+
+2005-02-06 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * DETAILS: BUILD_API=2, xfree-4.3. and xorg support
+       * BUILD: patch for 2.6.10 kernel, BUILD_API2 conversion
+       * INSTALL: added for BUILD_API2 conversion
+       * CONFIGURE: ask to build the qt-x11 control panel
+       * smgl.qt.fix.patch: adds a -I/usr/include/qt and removes
+         the nonexistant .kdelink and .desktop files
+       * 2.6.10-fix.patch: a fix for 2.6.10 kernels
+       * libstdc++.so.5: this is needed to run fgl_glxgears
+         I tried building it but that one seg faulted on run
+
+2004-10-18 Eric Sandall <eric AT sandall.us>
+       * DEPENDS: Added "&&"
+
+2004-09-09 Eric Schabell <eschabell AT sourcemage.org>
+       * DETAILS, BUILD: updated for v3.11.1, fixes bug #7036.
+
+2004-07-17 Eric Sandall <eric AT sandall.us>
+       * DETAILS: Renamed to ati_driver
+         Added md5sum
+       * CONFLICTS: Conflicts with ATI_driver
+
+2004-05-03 Seth Woolley <seth AT tautology.org>
+       * DETAILS: removed space from LICENSE
+
+2004-04-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * TRIGGERS: added trigger for xfree86-4.3 and xorg
+
+2004-03-15 Chris Dennis <Chris.Dennis AT UAlberta.NET>
+       * DETAILS: Updated to 3.7.6
+
+2003-12-10 Eric Sandall <eric AT sandall.us>
+       * DETAILS: Put quotes around the dual licenses
+       * HISTORY: Formatted to Guru Handbook
+
+2003-11-20 Chris Dennis <Chris.Dennis AT UAlberta.NET>
+       * DETAILS: Updated to 3.2.8
+
+2003-09-10 Chris Dennis <Chris.Dennis AT UAlberta.NET>
+       * Created this spell
+
diff --git a/z-kernels/ati_driver-new/INSTALL 
b/z-kernels/ati_driver-new/INSTALL
new file mode 100755
index 0000000..88e83a6
--- /dev/null
+++ b/z-kernels/ati_driver-new/INSTALL
@@ -0,0 +1,48 @@
+mkdir -vp ${INSTALL_ROOT}/usr/include/GL/                &&
+mkdir -vp ${INSTALL_ROOT}/usr/lib/ati/                   &&
+mkdir -vp ${INSTALL_ROOT}/usr/lib/modules/dri/           &&
+mkdir -vp ${INSTALL_ROOT}/usr/lib/xorg/modules/drivers/  &&
+mkdir -vp ${INSTALL_ROOT}/usr/lib/xorg/modules/linux/    &&
+ln -fs ${INSTALL_ROOT}/usr/lib/modules/dri/              \
+       ${INSTALL_ROOT}/usr/lib/dri                       &&
+cd $SOURCE_DIRECTORY/lib/modules/fglrx/                  &&
+sedit "s:modprobe:echo:" make_install.sh                 &&
+sedit "s:rmmod:echo:" make_install.sh                    &&
+sh ./make_install.sh                                     &&
+cd $SOURCE_DIRECTORY                                     &&
+install_config_file etc/fglrxrc                          \
+                    $INSTALL_ROOT/etc/fglrxrc            &&
+install_config_file etc/fglrxprofiles.csv                \
+                    $INSTALL_ROOT/etc/fglrxprofiles.csv  &&
+
+
+cp -vr etc/ati $INSTALL_ROOT/etc/                        &&
+cp -v  usr/include/GL/*                                  \
+       ${INSTALL_ROOT}/usr/include/GL/                   &&
+cp -v  usr/sbin/* ${INSTALL_ROOT}/usr/sbin/              &&
+cp -vR usr/share/* ${INSTALL_ROOT}/usr/share/            &&
+cp -v  usr/X11R6/bin/* ${INSTALL_ROOT}/usr/bin/          &&
+mv -v  usr/X11R6/lib/libGL.so.1.2                        \
+       ${INSTALL_ROOT}/usr/lib/ati/libGL.so.1.2          &&
+pushd ${INSTALL_ROOT}/usr/lib/ati/                       &&
+ln -s libGL.so.1.2 libGL.so.1                            &&
+ln -s libGL.so.1.2 libGL.so                              &&
+popd                                                     &&
+if ! check_if_xorg_modular_libs ; then
+cp -vR usr/X11R6/lib/*                                   \
+       ${INSTALL_ROOT}/usr/X11R6/
+else
+cp -vR usr/X11R6/lib/modules/dri/*                       \
+       ${INSTALL_ROOT}/usr/lib/modules/dri/              &&
+cp -vR usr/X11R6/lib/modules/drivers/*                   \
+       ${INSTALL_ROOT}/usr/lib/xorg/modules/drivers/     &&
+cp -vR usr/X11R6/lib/modules/linux/*                     \
+       ${INSTALL_ROOT}/usr/lib/xorg/modules/linux/
+fi
+cp -v  usr/X11R6/include/* ${INSTALL_ROOT}/usr/include/  &&
+if [[ "${ATI_DRIVER_QT}" == "y" ]]
+then  
+  cd $SOURCE_DIRECTORY/fglpanel                          &&
+  make install
+fi
+
diff --git a/z-kernels/ati_driver-new/POST_REMOVE 
b/z-kernels/ati_driver-new/POST_REMOVE
new file mode 100755
index 0000000..5faa94d
--- /dev/null
+++ b/z-kernels/ati_driver-new/POST_REMOVE
@@ -0,0 +1,6 @@
+. $GRIMOIRE/FUNCTIONS  &&
+if check_if_xorg_modular_libs ; then
+smgl-gl_select -s mesa
+else
+smgl_gl-select -s monolithic
+fi
diff --git a/z-kernels/ati_driver-new/PREPARE 
b/z-kernels/ati_driver-new/PREPARE
new file mode 100755
index 0000000..eb60306
--- /dev/null
+++ b/z-kernels/ati_driver-new/PREPARE
@@ -0,0 +1,6 @@
+. $GRIMOIRE/REJECTED_MSG  &&
+message "The following driver versions are available:" &&
+message "8.29.6 - Doesn't support r85xx-92xx!!!"  &&
+message "8.28.8 - Supports r85xx and above"  &&
+config_query_list ATI_VERSION "Which version do you want?" \
+                  '8.29.6' '8.28.8'
diff --git a/z-kernels/ati_driver-new/PRE_BUILD 
b/z-kernels/ati_driver-new/PRE_BUILD
new file mode 100755
index 0000000..7504ba7
--- /dev/null
+++ b/z-kernels/ati_driver-new/PRE_BUILD
@@ -0,0 +1,13 @@
+. $GRIMOIRE/FUNCTIONS                       &&
+mk_source_dir $SOURCE_DIRECTORY             &&
+cd $SOURCE_DIRECTORY                        &&
+unpack_file ''                              &&
+if [[ "${ATI_DRIVER_QT}" == "y" ]]
+then
+   mkdir -p ${SOURCE_DIRECTORY}/fglpanel    &&
+   cd fglpanel                              &&
+   tar -zxvf ${SOURCE_DIRECTORY}/usr/src/ATI/fglrx_panel_sources.tgz  &&
+   cd $SOURCE_DIRECTORY
+fi                                          &&
+sedit "s:ln\ \-s:cp\ \-v:g" lib/modules/fglrx/make_install.sh
+
diff --git a/z-kernels/ati_driver-new/TRIGGERS 
b/z-kernels/ati_driver-new/TRIGGERS
new file mode 100755
index 0000000..d4a8851
--- /dev/null
+++ b/z-kernels/ati_driver-new/TRIGGERS
@@ -0,0 +1,5 @@
+on_cast  linux  cast_self
+on_cast  xfree86 cast_self
+on_cast  xfree86-4.3 cast_self
+on_cast  xorg cast_self
+on_cast  xfree86-devel cast_self
diff --git a/z-kernels/ati_driver-new/smgl.qt.patch 
b/z-kernels/ati_driver-new/smgl.qt.patch
new file mode 100644
index 0000000..ad5456e
--- /dev/null
+++ b/z-kernels/ati_driver-new/smgl.qt.patch
@@ -0,0 +1,52 @@
+--- back/Makefile      2004-12-14 18:55:05.000000000 +0100
++++ Makefile   2005-02-06 14:45:47.265954864 +0100
+@@ -87,12 +87,12 @@
+ $(error environment missing: MK_QTDIR=$(MK_QTDIR))
+ endif
+ 
+-ifeq ($(shell test -e $(MK_QTDIR)/include/qglobal.h$(colon) echo $$?),1)
++ifeq ($(shell test -e $(MK_QTDIR)/include/qt/qglobal.h$(colon) echo $$?),1)
+ $(error environment incomplete: MK_QTDIR=$(MK_QTDIR))
+ endif
+ 
+ ifeq ($(QT_VER),0)
+-QT_VER=$(shell grep QT_VERSION_STR $(MK_QTDIR)/include/qglobal.h | cut 
-d'"' -f2 | cut -d'.' -f1)
++QT_VER=$(shell grep QT_VERSION_STR $(MK_QTDIR)/include/qt/qglobal.h | cut 
-d'"' -f2 | cut -d'.' -f1)
+ endif
+ 
+ ifeq ($(QT_VER),0)
+@@ -136,7 +136,7 @@
+ DEFINES = -Dlinux -DFGLRX_USE_XEXTENSIONS -DFGLRX_OGL_INFO -DQT_NO_STL
+ 
+ # for *.c
+-CINCDIR = -I/usr/X11R6/include -I. -I./include_dummy
++CINCDIR = -I/usr/X11R6/include -I. -I./include_dummy -I/usr/include/qt
+ CDEFINES = $(DEFINES)
+ ifeq ($(DEBUG),0)
+ CDEBFLAGS = -g
+@@ -145,7 +145,7 @@
+ LFLAGS = $(CDEBFLAGS) -L/usr/X11R6/$(LIB_DIR) -lXaw -lXmu -lXt -lXext -lX11
+ 
+ # for *.cpp
+-CCINCDIR = -I$(MK_QTDIR)/include -I. -I./include_dummy
++CCINCDIR = -I$(MK_QTDIR)/include -I. -I./include_dummy -I/usr/include/qt
+ CCDEFINES = $(DEFINES)
+ ifneq ($(DEBUG),0)
+ CCDEBFLAGS = -ggdb
+@@ -405,16 +405,6 @@
+       cd /usr/X11R6/bin/. ; rm -f $(BASENAME) ; ln -s $(TARGET0) $(BASENAME)
+       cp LICENSE.GPL /usr/X11R6/bin/.
+       cp LICENSE.QPL /usr/X11R6/bin/.
+-      if  [ $KDEDIR ]; then\
+-        cp fireglcontrol.kdelnk $(KDEDIR)/share/applnk/. ;\
+-        cp ati.xpm $(KDEDIR)/share/icons/. ;\
+-      fi
+-      if test -d /usr/share/gnome/apps; then \
+-        cp fireglcontrol.desktop /usr/share/gnome/apps/. ;\
+-        if test -d /usr/share/pixmaps; then \
+-          cp ati.xpm /usr/share/pixmaps/. ;\
+-        fi ;\
+-      fi
+ 
+ source_package::
+       @if [ -f $(PACKET_NAME).tar ]; then      \