[SM-Commit] GIT changes to master grimoire by Arjan Bouter (56b11a432efc85df25d6e184514e620a5ab85d6c)

Arjan Bouter scm at sourcemage.org
Wed Mar 4 04:47:21 EST 2009


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

 xorg-driver/xf86-video-ati/DETAILS   |   20 +++++++++++++++-----
 xorg-driver/xf86-video-ati/HISTORY   |    5 +++++
 xorg-driver/xf86-video-ati/PREPARE   |    2 ++
 xorg-driver/xf86-video-ati/PRE_BUILD |    6 ++++++
 4 files changed, 28 insertions(+), 5 deletions(-)

New commits:
commit 3519b03dc87d2c19d258626365b9dda5a2e66cad
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    xf86-video-ati: added SCM version.

diff --git a/xorg-driver/xf86-video-ati/DETAILS b/xorg-driver/xf86-video-ati/DETAILS
index 07e5829..1ab50e6 100755
--- a/xorg-driver/xf86-video-ati/DETAILS
+++ b/xorg-driver/xf86-video-ati/DETAILS
@@ -1,12 +1,22 @@
            SPELL=xf86-video-ati
-             PKG=xf86-video-ati
-         VERSION=6.11.0
         XORG_VER=X11R7.1
-          SOURCE=${PKG}-${VERSION}.tar.bz2
+if [[ $ATI_SCM == y ]]; then
+if [[ $ATI_AUTO == y ]]; then
+         VERSION=$(date +%Y%m%d)
+  FORCE_DOWNLOAD=on
+else
+         VERSION=scm
+fi
+          SOURCE=$SPELL-scm.tar.bz2
+   SOURCE_URL[0]="git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati"
+   SOURCE_IGNORE=volatile
+else
+         VERSION=6.11.0
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-#     SOURCE_HASH=sha512:3ca158678fb3fac31539bdd529baeddfd92879b8e7e32dbe79d717c7ad483782226c06cd0cbd1ded708752256a3a5553266ad5e464b986f0c99b0eaff371b4c0
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+fi
+          SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20051125
       LICENSE[0]=XCL
diff --git a/xorg-driver/xf86-video-ati/HISTORY b/xorg-driver/xf86-video-ati/HISTORY
index 4f9afa5..d905e01 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,3 +1,8 @@
+2009-03-04 Arjan Bouter <abouter at sourcemage.org>
+	* PREPARE,PRE_BUILD: added for optional SCM version.
+	* DETAILS: added SCM version, removed PKG var,
+	  removed unused source hash
+
 2009-02-25 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 6.11.0
 	  MD5 matches upstream published MD5
diff --git a/xorg-driver/xf86-video-ati/PREPARE b/xorg-driver/xf86-video-ati/PREPARE
new file mode 100755
index 0000000..34ff9aa
--- /dev/null
+++ b/xorg-driver/xf86-video-ati/PREPARE
@@ -0,0 +1,2 @@
+config_query ATI_SCM "Do you want SCM version" n &&
+config_query ATI_AUTO "Automaticaly update the spell on sorcery queue/system-update?" n
diff --git a/xorg-driver/xf86-video-ati/PRE_BUILD b/xorg-driver/xf86-video-ati/PRE_BUILD
new file mode 100755
index 0000000..ecc94ad
--- /dev/null
+++ b/xorg-driver/xf86-video-ati/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build                     &&
+if [[ $ATI_SCM == y ]] ; then
+cd $SOURCE_DIRECTORY                  &&
+sedit "s:.*configure.*::" autogen.sh  &&
+./autogen.sh
+fi



More information about the SM-Commit mailing list