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                                      |    5 -----
 kernels/drm/HISTORY                                      |    4 ++++
 kernels/drm/PRE_BUILD                                    |    6 ++++++
 kernels/linux/HISTORY                                    |    3 +++
 kernels/linux/info/patches/zen_patches/2.6.29-zen2.patch |    6 ++++++
 x11/xvkbd/BUILD                                          |    2 +-
 x11/xvkbd/DEPENDS                                        |    3 +--
 x11/xvkbd/HISTORY                                        |    4 ++++
 x11/xvkbd/PRE_BUILD                                      |    8 ++++++++
 9 files changed, 33 insertions(+), 8 deletions(-)

New commits:
commit 738da8fefb05b8917e2a0d322eabc74a4cb50981
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    drm: fixed r6xx-r7xx-support branch

commit 9d81c1631b90c7612a011a03940a819ae0dab5e6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    linux: updated zen patches

commit 8313c04f9d340fc796df81ba1c3475b484b558ea
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    xvkbd: removed unused lesstif dep and made xaw3d optional

diff --git a/kernels/drm/DETAILS b/kernels/drm/DETAILS
index 9825dc1..416bc49 100755
--- a/kernels/drm/DETAILS
+++ b/kernels/drm/DETAILS
@@ -7,12 +7,7 @@ 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
diff --git a/kernels/drm/HISTORY b/kernels/drm/HISTORY
index 6b13f00..35217df 100644
--- a/kernels/drm/HISTORY
+++ b/kernels/drm/HISTORY
@@ -1,3 +1,7 @@
+2009-04-07 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: removed r6xx-r7xx info, now handled in PRE_BUILD
+       * PRE_BUILD: added for r6xx-r7xx-support branch
+
 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
diff --git a/kernels/drm/PRE_BUILD b/kernels/drm/PRE_BUILD
new file mode 100755
index 0000000..982971a
--- /dev/null
+++ b/kernels/drm/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+if [[ "$DRM_6XX" == "y" ]]; then
+  cd ${SOURCE_DIRECTORY}/linux-core &&
+  git checkout -b r6xx-r7xx-support origin/r6xx-r7xx-support
+fi &&
+cd ${SOURCE_DIRECTORY}
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 8ada6f9..6597dee 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,6 @@
+2009-04-07 Arjan Bouter <abouter AT sourcemage.org>
+       * info/patches/zen_patches/2.6.29-zen2: added latest zen kernel
+
 2009-04-04 Eric Sandall <sandalle AT sourcemage.org>
        * info/patches/smgl_patches/smgl-logo-0.2-for-2.6.22.patch: Applies to
          2.6.29 as well
diff --git a/kernels/linux/info/patches/zen_patches/2.6.29-zen2.patch 
b/kernels/linux/info/patches/zen_patches/2.6.29-zen2.patch
new file mode 100644
index 0000000..cff6c62
--- /dev/null
+++ b/kernels/linux/info/patches/zen_patches/2.6.29-zen2.patch
@@ -0,0 +1,6 @@
+appliedkernels="2.6.29"
+depends=""
+patchversion="${appliedkernels}-zen2"
+source="${patchversion}.patch.lzma"
+source_url="http://zen-sources.org/files/${source}";
+md5="ec7b2a8de1a33a1ceb987c4ddae69d4c"
diff --git a/x11/xvkbd/BUILD b/x11/xvkbd/BUILD
index 1ad2cca..25fc63c 100755
--- a/x11/xvkbd/BUILD
+++ b/x11/xvkbd/BUILD
@@ -1,2 +1,2 @@
-mxmkmf &&
+xmkmf &&
 make
diff --git a/x11/xvkbd/DEPENDS b/x11/xvkbd/DEPENDS
index 9b67d55..44a670a 100755
--- a/x11/xvkbd/DEPENDS
+++ b/x11/xvkbd/DEPENDS
@@ -1,3 +1,2 @@
-depends lesstif &&
-depends xaw3d &&
+optional_depends xaw3d '' '' 'for 3D keys' &&
 depends libxtst
diff --git a/x11/xvkbd/HISTORY b/x11/xvkbd/HISTORY
index 18de331..fc387d8 100644
--- a/x11/xvkbd/HISTORY
+++ b/x11/xvkbd/HISTORY
@@ -1,3 +1,7 @@
+2009-04-07 Arjan Bouter <abouter AT sourcemage.org>
+       * BUILD: mxmkmf -> xmkmf
+       * DEPENDS, PRE_BUILD: made xaw3d optional and removed lesstiff
+
 2009-03-28 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: updated spell to 3.0
        * BUILD: make here first not in INSTALL
diff --git a/x11/xvkbd/PRE_BUILD b/x11/xvkbd/PRE_BUILD
new file mode 100755
index 0000000..8afc17a
--- /dev/null
+++ b/x11/xvkbd/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+if ( is_depends_enabled $SPELL xaw3d ); then
+  message "leaving Xaw3D enabled"
+else
+  sedit '/^#define XAW3D$/d' Imakefile
+fi
+