[SM-Commit] GIT changes to master games grimoire by Jaka Kranjc (a330fe50d2a3d72b1c70be2a9a98128dbd356075)

Jaka Kranjc scm at sourcemage.org
Mon Apr 30 12:45:12 EDT 2007


GIT changes to master games grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 games-strategy-tbs/wesnoth/DEPENDS   |   10 +++++++++-
 games-strategy-tbs/wesnoth/DETAILS   |   17 ++++++++++++-----
 games-strategy-tbs/wesnoth/DOWNLOAD  |   27 +++++++++++++++++++++++++++
 games-strategy-tbs/wesnoth/HISTORY   |    6 ++++++
 games-strategy-tbs/wesnoth/PREPARE   |    3 ++-
 games-strategy-tbs/wesnoth/PRE_BUILD |    5 +++++
 6 files changed, 61 insertions(+), 7 deletions(-)

New commits:
commit a330fe50d2a3d72b1c70be2a9a98128dbd356075
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    wesnoth: update to 1.3.2 and implement xdelta support (4mb dl instead of 100mb)

diff --git a/games-strategy-tbs/wesnoth/DEPENDS b/games-strategy-tbs/wesnoth/DEPENDS
index f06450e..9beb3d2 100755
--- a/games-strategy-tbs/wesnoth/DEPENDS
+++ b/games-strategy-tbs/wesnoth/DEPENDS
@@ -1,4 +1,12 @@
 depends  freetype2  &&
 depends  sdl_image  &&
 depends  sdl_mixer  &&
-depends  sdl_net
+depends  sdl_net &&
+
+if [[ $WESNOTH_DEVEL == y ]]; then
+  depends python
+fi &&
+
+if [[ $WESNOTH_XDELTA == y ]]; then
+  depends xdelta
+fi
diff --git a/games-strategy-tbs/wesnoth/DETAILS b/games-strategy-tbs/wesnoth/DETAILS
index 2a51d20..45fba4a 100755
--- a/games-strategy-tbs/wesnoth/DETAILS
+++ b/games-strategy-tbs/wesnoth/DETAILS
@@ -1,14 +1,21 @@
            SPELL=wesnoth
   if [[ ${WESNOTH_DEVEL} == y ]]; then
-         VERSION=1.3.1
-          SOURCE=${SPELL}-${VERSION}.tar.bz2
-     SOURCE_HASH=sha512:2c4a23ecb761cd58e8d1118601fd76cd064f17dfbb35ab239792dca92d92c3590cf3254bfd709336f70a6872be98267a6647f5602434ef68dd0b68041959ad1c
+         VERSION=1.3.2
+     OLD_VERSION=1.3.1
+     # this is always the hash for the $VERSION tarball
+     SOURCE_HASH=sha512:b1eebd11abec13f590062f8d549d3cc82918ef6001516b810d37ba05c82c1ec0ce5e0173a307f6ac8752f6100c83d379ea849c190cb283ac3d8baaa99a4f451b
   else
          VERSION=1.2.4
-          SOURCE=${SPELL}-${VERSION}.tar.bz2
+     OLD_VERSION=1.2.3
      SOURCE_HASH=sha512:e6eccb2ab7b37d34b76fac3b5a9c765214dad0b1d2644b0b664d694f33a8b95304c13f9c9e71f89a64d1178a34cb9fb4b368617f5260cea72d7f5befb5089df2
   fi
-   SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+          SOURCE=$SPELL-$VERSION.tar.bz2
+ # check that we have the previous tarball first and if so, enable xdelta
+ if [[ $WESNOTH_XDELTA == y && -e $SOURCE_CACHE/$SPELL-$OLD_VERSION.tar.bz2 ]]
+ then
+          SOURCE=$SPELL-$OLD_VERSION.tar-$SPELL-$VERSION.tar.xdelta
+ fi
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
       LICENSE[0]=GPL
         WEB_SITE=http://www.wesnoth.org/
diff --git a/games-strategy-tbs/wesnoth/DOWNLOAD b/games-strategy-tbs/wesnoth/DOWNLOAD
new file mode 100755
index 0000000..eeb993d
--- /dev/null
+++ b/games-strategy-tbs/wesnoth/DOWNLOAD
@@ -0,0 +1,27 @@
+default_download &&
+if [[ $WESNOTH_XDELTA == y ]]; then
+  # skip if we already have the new tarball
+  [[ -e $SOURCE_CACHE/$SPELL-$VERSION.tar.bz2 ]] && return 0
+
+  # if there was no old tarball the option was overriden, so check for that
+  if [[ ${SOURCE/xdelta/} != $SOURCE ]]; then 
+    # we have the xdelta and the old source, so make the new tarball
+    local old_source=$SPELL-$OLD_VERSION.tar.bz2 &&
+    pushd $SOURCE_CACHE &> /dev/null &&
+    cp $old_source $old_source.bk &&
+
+    message "Uncompressing old sources ..." &&
+    bunzip2 $old_source &&
+
+    message "Applying the xdelta ..." &&
+    xdelta patch $SOURCE &&
+
+    message "Compressing new sources ..." &&
+    bzip2 $SPELL-$VERSION.tar &&
+
+    rm ${old_source%.bz2} &&
+    mv $old_source.bk $old_source &&
+    popd &> /dev/null &&
+    message "Download complete!"
+  fi
+fi
diff --git a/games-strategy-tbs/wesnoth/HISTORY b/games-strategy-tbs/wesnoth/HISTORY
index 2ba70f2..ff46e9c 100644
--- a/games-strategy-tbs/wesnoth/HISTORY
+++ b/games-strategy-tbs/wesnoth/HISTORY
@@ -1,3 +1,9 @@
+2007-04-28 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DEPENDS: added python for devel and optionally xdelta
+	* PREPARE: ask for spell xdelta support
+	* DOWNLOAD, PRE_BUILD: added for xdelta handling
+	* DETAILS: updated devel to 1.3.2, implemented xdelta logic
+
 2007-04-15 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DETAILS: updated WESNOTH_DEVEL=n to 1.2.4
 
diff --git a/games-strategy-tbs/wesnoth/PREPARE b/games-strategy-tbs/wesnoth/PREPARE
index 71747fc..9e641c8 100755
--- a/games-strategy-tbs/wesnoth/PREPARE
+++ b/games-strategy-tbs/wesnoth/PREPARE
@@ -1 +1,2 @@
-config_query WESNOTH_DEVEL "Use development branch?" n
+config_query WESNOTH_DEVEL "Use development branch?" n &&
+config_query WESNOTH_XDELTA "Use xdeltas to minimise the source download size if possible?" n
diff --git a/games-strategy-tbs/wesnoth/PRE_BUILD b/games-strategy-tbs/wesnoth/PRE_BUILD
new file mode 100755
index 0000000..295dfd1
--- /dev/null
+++ b/games-strategy-tbs/wesnoth/PRE_BUILD
@@ -0,0 +1,5 @@
+if [[ $WESNOTH_XDELTA == y && ${SOURCE/xdelta/} != $SOURCE ]]; then
+  # override SOURCE, so the new tarball gets checked, not the xdelta
+  SOURCE=$SPELL-$VERSION.tar.bz2
+fi &&
+default_pre_build



More information about the SM-Commit mailing list