Source Mage code commit list

[Arjan Bouter <scm AT sourcemage.org>]

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

 kernels/drm/DETAILS                     |    6 ++++++
 kernels/drm/HISTORY                     |    5 +++++
 kernels/drm/PREPARE                     |    3 +++
 kernels/drm/PRE_SUB_DEPENDS             |    4 ++++
 kernels/drm/SUB_DEPENDS                 |    6 ++++++
 xorg-driver/xf86-video-radeonhd/DEPENDS |    4 ++++
 xorg-driver/xf86-video-radeonhd/DETAILS |    5 +++++
 xorg-driver/xf86-video-radeonhd/HISTORY |    4 ++++
 xorg-driver/xf86-video-radeonhd/PREPARE |    1 +
 9 files changed, 38 insertions(+)

New commits:
commit 05967dd6fb6b2dd36a369045d3210bfa7d99f68c
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    xf86-video-radeon: added options to use the r6xx-r7xx-support branch
    this branch enables the use of xv and provides 2D acceleration on
    ati/amd r6xx and r7xx based cards.

commit 7679f3e293d448f46530adc57feb15d1b4cf2aca
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    drm: added options to use the r6xx-r7xx-support branch
    this branch enables dri for ati/amd r6xx and r7xx based cards

diff --git a/kernels/drm/DETAILS b/kernels/drm/DETAILS
index 6ad1527..9825dc1 100755
--- a/kernels/drm/DETAILS
+++ b/kernels/drm/DETAILS
@@ -7,11 +7,17 @@ else
 fi
           SOURCE=$SPELL-git.tar.bz2
   FORCE_DOWNLOAD=on
+if [[ "$DRM_6XX" == "y" ]]
+then
+      
SOURCE_URL=git://anongit.freedesktop.org/git/mesa/drm:drm-git:r6xx-r7xx-support
+else
       SOURCE_URL=git://anongit.freedesktop.org/git/mesa/drm:drm-git
+fi
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-git
         WEB_SITE=http://dri.freedesktop.org
          ENTERED=20060913
+      PATCHLEVEL=1
       LICENSE[0]=GPL
            SHORT="The kernel Direct Rendering Manager"
 cat << EOF
diff --git a/kernels/drm/HISTORY b/kernels/drm/HISTORY
index 89e69ca..6b13f00 100644
--- a/kernels/drm/HISTORY
+++ b/kernels/drm/HISTORY
@@ -1,3 +1,8 @@
+2009-02-27 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS,PREPARE,SUB_DEPENDS,PRE_SUB_DEPENDS: added the experimental
+         r6xx-r7xx-support branch, which enables xv and acc. 2d for r6xx and
+          r7xx based cards.
+
 2009-01-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * INSTALL: no longer needs to install the nouveau header
        * CONFIGURE: i915 is maintained in kernel,
diff --git a/kernels/drm/PREPARE b/kernels/drm/PREPARE
index 3106d2c..4a33c0d 100755
--- a/kernels/drm/PREPARE
+++ b/kernels/drm/PREPARE
@@ -1,6 +1,9 @@
 config_query DRM_AUTOUPDATE \
        "Automaticaly update the spell on sorcery queue/system-update?" "n"  
&&
 
+config_query DRM_6XX \
+       "Use the EXPERIMENTAL r6xx-7xx-support branch?" "n"  &&
+
 #
 # At least for 2.6.26 and 2.6.27, drm requires CONFIG_UNUSED_SYMBOLS=y
 # to define init_mm
diff --git a/kernels/drm/PRE_SUB_DEPENDS b/kernels/drm/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..5f62e8e
--- /dev/null
+++ b/kernels/drm/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+  6XX) [[ $DRM_6XX == y ]] && return 0 ;;
+esac
+return 1
diff --git a/kernels/drm/SUB_DEPENDS b/kernels/drm/SUB_DEPENDS
new file mode 100755
index 0000000..22b778d
--- /dev/null
+++ b/kernels/drm/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+  6XX) DRM_DRIVERS="radeon"
+       DRM_6XX=y       
+       ;;
+  *) echo "Unknown sub_depends!"; return 1 ;;
+esac
diff --git a/xorg-driver/xf86-video-radeonhd/DEPENDS 
b/xorg-driver/xf86-video-radeonhd/DEPENDS
index 6f1cfba..cbe9d65 100755
--- a/xorg-driver/xf86-video-radeonhd/DEPENDS
+++ b/xorg-driver/xf86-video-radeonhd/DEPENDS
@@ -4,4 +4,8 @@ if [[ $RADEONHD_SCM == y ]] ; then
 depends git
 fi  &&
 depends libdrm  &&
+if [[ $RADEONHD_6XX == y ]] ; then
+depends drm
+sub_depends drm 6XX
+fi  &&
 depends xorg-server 
diff --git a/xorg-driver/xf86-video-radeonhd/DETAILS 
b/xorg-driver/xf86-video-radeonhd/DETAILS
index 8a4cf23..bce3eda 100755
--- a/xorg-driver/xf86-video-radeonhd/DETAILS
+++ b/xorg-driver/xf86-video-radeonhd/DETAILS
@@ -7,7 +7,11 @@ else
 fi
           SOURCE=$SPELL-scm.tar.bz2
   FORCE_DOWNLOAD=on
+if [[ $RADEONHD_6XX == y ]]; then
+   
SOURCE_URL[0]="git://anongit.freedesktop.org/git/xorg/driver/xf86-video-radeonhd:xf86-video-radeonhd-scm:r6xx-r7xx-support"
+else
    
SOURCE_URL[0]="git://anongit.freedesktop.org/git/xorg/driver/xf86-video-radeonhd:xf86-video-radeonhd-scm"
+fi
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
 else
@@ -18,6 +22,7 @@ else
      
SOURCE_HASH=sha512:0ecf9528d140572ab0ffaf89ead8d15e1786462ed6691e7855183a45b7fe9329dad7b4ad864a0ce9fb3555114494f8e1baba033df8332e973b408d6a79f35d67
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
+      PATCHLEVEL=1
         WEB_SITE=http://xorg.freedesktop.org/wiki
       LICENSE[0]=XCL
          ENTERED=20070714
diff --git a/xorg-driver/xf86-video-radeonhd/HISTORY 
b/xorg-driver/xf86-video-radeonhd/HISTORY
index 392d03c..c261176 100644
--- a/xorg-driver/xf86-video-radeonhd/HISTORY
+++ b/xorg-driver/xf86-video-radeonhd/HISTORY
@@ -1,3 +1,7 @@
+2009-02-27 Arjan Bouter <abouter AT sourcemage.org>
+        * DETAILS,PREPARE,DEPENDS: added the experimental r6xx-r7xx-support
+          branch, which enables xv and acc. 2d for r6xx and r7xx based cards.
+
 2009-01-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: updated spell to 1.2.4
        * DEPENDS: no longer needs drm, libdrm is sufficient
diff --git a/xorg-driver/xf86-video-radeonhd/PREPARE 
b/xorg-driver/xf86-video-radeonhd/PREPARE
index 4409d09..9d5dff4 100755
--- a/xorg-driver/xf86-video-radeonhd/PREPARE
+++ b/xorg-driver/xf86-video-radeonhd/PREPARE
@@ -1,6 +1,7 @@
 config_query RADEONHD_SCM "Do you want SCM version" n &&
 if [[ "$RADEONHD_SCM" == "y" ]]
 then
+config_query RADEONHD_6XX "Do you want the EXPERIMENTAL r6xx-7xx-support 
branch?" n &&
 config_query RADEONHD_AUTO \
           "Automaticaly update the spell on sorcery queue/system-update?" \
           "n"