Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Robin Cook (ee45186179a5347a3b3c5bd4e903b08197bb6c26)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Robin Cook (ee45186179a5347a3b3c5bd4e903b08197bb6c26)
  • Date: Sat, 3 Mar 2012 21:46:41 -0600

GIT changes to master games grimoire by Robin Cook <rcook AT wyrms.net>:

dev/null |binary
games-arcade-2d/pingus/BUILD | 2
games-arcade-2d/pingus/DEPENDS | 2
games-arcade-2d/pingus/DETAILS | 22 +++---
games-arcade-2d/pingus/HISTORY | 6 +
games-arcade-2d/pingus/INSTALL | 2
games-arcade-2d/pingus/PREPARE | 8 +-
games-arcade-2d/pingus/pingus-0.7.6.tar.bz2.sig |binary
games-strategy-tbs/wesnoth/BUILD | 13 ++--
games-strategy-tbs/wesnoth/CONFIGURE | 57
+++++++-----------
games-strategy-tbs/wesnoth/DEPENDS | 36 ++++++++---
games-strategy-tbs/wesnoth/DETAILS | 16 ++---
games-strategy-tbs/wesnoth/HISTORY | 10 +++
games-strategy-tbs/wesnoth/INSTALL | 15 ----
games-strategy-tbs/wesnoth/PRE_BUILD | 16 ++---
games-strategy-tbs/wesnoth/desktop/wesnoth.desktop | 2
games-strategy-tbs/wesnoth/wesnoth-1.10.1.tar.bz2.sig |binary
games-strategy-tbs/wesnoth/wesnoth-1.8.5.tar.bz2.sig | 0
games-strategy-tbs/wesnoth/wesnoth-1.9.2.tar.bz2.sig | 0
19 files changed, 113 insertions(+), 94 deletions(-)

New commits:
commit ee45186179a5347a3b3c5bd4e903b08197bb6c26
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

wesnoth: update to 1.10.1

commit 1d94816f7c5941f837deef332c8fb3c299b97dea
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

pingus: updated to 0.7.6

diff --git a/games-arcade-2d/pingus/BUILD b/games-arcade-2d/pingus/BUILD
index ebff829..8f58e6d 100755
--- a/games-arcade-2d/pingus/BUILD
+++ b/games-arcade-2d/pingus/BUILD
@@ -1 +1 @@
-scons
+make
diff --git a/games-arcade-2d/pingus/DEPENDS b/games-arcade-2d/pingus/DEPENDS
index b5f895e..fcf3d65 100755
--- a/games-arcade-2d/pingus/DEPENDS
+++ b/games-arcade-2d/pingus/DEPENDS
@@ -1,3 +1,5 @@
+depends gcc &&
+depends -sub CXX gcc &&
depends sdl &&
depends sdl_mixer &&
depends sdl_image &&
diff --git a/games-arcade-2d/pingus/DETAILS b/games-arcade-2d/pingus/DETAILS
index a827bc0..ca274b0 100755
--- a/games-arcade-2d/pingus/DETAILS
+++ b/games-arcade-2d/pingus/DETAILS
@@ -1,24 +1,24 @@
SPELL=pingus
-if [ "$PINGUS_SVN" == "y" ]; then
- if [ "$PINGUS_SVN_AUTOUPDATE" == "y" ]; then
+if [ "$PINGUS_GIT" == "y" ]; then
+ if [ "$PINGUS_GIT_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=svn
+ VERSION=git
fi
- SOURCE=$SPELL-svn.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn://svn.berlios.de/pingus/trunk:${SPELL}-svn
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ SOURCE_URL[0]=git://https://code.google.com/p/pingus:${SPELL}-git
SOURCE_IGNORE=volatile
else
- VERSION=0.7.3
+ VERSION=0.7.6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://pingus.seul.org/files/$SOURCE
-
SOURCE_HASH=sha512:9992fce8343e44da1b411eeb4468cb44cd42750f222836f51997e10e696bf742e3dbffca4ee063c1795f1350bd2ea81d20afa943dda123c024851e1b8bbd9c29
+ SOURCE_URL[0]=https://pingus.googlecode.com/files/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
- WEB_SITE=http://pingus.seul.org/welcome.html
+ WEB_SITE=http://pingus.seul.org/
ENTERED=20030612
- LICENSE[0]=GPL
+ LICENSE[0]=GPL3
SHORT="Lemmings(tm) clone"
cat << EOF
While Pingus is based on the idea of Lemmings(tm), it has included some
diff --git a/games-arcade-2d/pingus/HISTORY b/games-arcade-2d/pingus/HISTORY
index 001b2cc..6db2302 100644
--- a/games-arcade-2d/pingus/HISTORY
+++ b/games-arcade-2d/pingus/HISTORY
@@ -1,3 +1,9 @@
+2012-03-03 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 0.7.6, changed to GIT
+ * PREPARE: changed to GIT
+ * BUILD: used new Makefile
+ * INSTALL: use new Makefile
+
2010-04-07 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 0.7.3

diff --git a/games-arcade-2d/pingus/INSTALL b/games-arcade-2d/pingus/INSTALL
index 11cbc59..16d7f7f 100755
--- a/games-arcade-2d/pingus/INSTALL
+++ b/games-arcade-2d/pingus/INSTALL
@@ -1 +1 @@
-./install.sh ${INSTALL_ROOT}/usr
+make install DESTDIR=$INSTALL_ROOT PREFIX=/usr
DATADIR=/usr/share/games/pinugs BINDIR=/usr/games
diff --git a/games-arcade-2d/pingus/PREPARE b/games-arcade-2d/pingus/PREPARE
index 8573112..25e126f 100755
--- a/games-arcade-2d/pingus/PREPARE
+++ b/games-arcade-2d/pingus/PREPARE
@@ -1,7 +1,7 @@
-config_query PINGUS_SVN "Build SVN version?" ${PINGUS_CVS:-n} &&
+config_query PINGUS_GIT "Build GIT version?" ${PINGUS_SVN:-n} &&

-if [ "$PINGUS_SVN" == "y" ]; then
- config_query PINGUS_SVN_AUTOUPDATE \
- "Update to the latest SVN automatically on every cast?"
${PINGUS_CVS_AUTOUPDATE:-n}
+if [ "$PINGUS_GIT" == "y" ]; then
+ config_query PINGUS_GIT_AUTOUPDATE \
+ "Update to the latest GIT automatically on every cast?"
${PINGUS_SVN_AUTOUPDATE:-n}
fi

diff --git a/games-arcade-2d/pingus/pingus-0.7.6.tar.bz2.sig
b/games-arcade-2d/pingus/pingus-0.7.6.tar.bz2.sig
new file mode 100644
index 0000000..5cbcb95
Binary files /dev/null and b/games-arcade-2d/pingus/pingus-0.7.6.tar.bz2.sig
differ
diff --git a/games-strategy-tbs/wesnoth/BUILD
b/games-strategy-tbs/wesnoth/BUILD
index 67fabc2..3ea8326 100755
--- a/games-strategy-tbs/wesnoth/BUILD
+++ b/games-strategy-tbs/wesnoth/BUILD
@@ -1,5 +1,10 @@
-OPTS="--disable-strict-compilation PYTHON_PREFIX=$INSTALL_ROOT/usr \
- ${WESNOTH_OPTS} \
- ${OPTS}" &&
+WESNOTH_PATHS="prefix=$INSTALL_ROOT/usr \
+ bindir=$INSTALL_ROOT/usr/games \
+ datadir=$INSTALL_ROOT/usr/share/games/$SPELL \
+ icondir=$INSTALL_ROOT/usr/share/games/icons \
+ desktopdir=$INSTALL_ROOT/usr/share/applications \
+ build_dir=wesnoth-build" &&

-default_games_build
+WESNOTH_OPTS="jobs=${MAKE_NJOBS} verbose=yes" &&
+
+scons $WESNOTH_BUILD $WESNOTH_PATHS $WESNOTH_OPTS $OPTS
diff --git a/games-strategy-tbs/wesnoth/CONFIGURE
b/games-strategy-tbs/wesnoth/CONFIGURE
index 2d0ccac..d9811dd 100755
--- a/games-strategy-tbs/wesnoth/CONFIGURE
+++ b/games-strategy-tbs/wesnoth/CONFIGURE
@@ -1,34 +1,25 @@
-if [[ ! -z $WESNOTH_STATIC ]]; then
- persistent_add WESNOTH_OPTS &&
- WESNOTH_OPTS="$WESNOTH_STATIC $WESNOTH_SERVER \
- $WESNOTH_CAMPAIGN $WESNOTH_EDITOR $WESNOTH_TOOLS" &&
- persistent_remove WESNOTH_STATIC WESNOTH_SERVER \
- WESNOTH_CAMPAIGN WESNOTH_EDITOR WESNOTH_TOOLS &&
- return 0
-fi &&
+config_query_option WESNOTH_BUILD \
+ "Build wesnoth game?" y \
+ "wesnoth" "" &&
+
+config_query_option WESNOTH_BUILD \
+ "Build wesnoth server?" y \
+ "wesnothd server_uid=daemon server_gid=games" "" &&
+
+config_query_option WESNOTH_BUILD \
+ "Build campaign server?" n \
+ "campaignd" "" &&
+
+config_query_option WESNOTH_BUILD \
+ "Build exploder tool?" n \
+ "exploder" "" &&
+
+config_query_option WESNOTH_BUILD \
+ "Build cutter tool?" n \
+ "cutter" "" &&
+
+config_query_option WESNOTH_OPTS \
+ "Enable static building of wesnoth?" n \
+ "static=yes" "static=no"
+

-config_query_option WESNOTH_OPTS
\
- "Enable static building of wesnoth?"
\
- n
\
- "--enable-static"
\
- "--disable-static"
&&
-config_query_option WESNOTH_OPTS
\
- "Enable compilation of server?"
\
- n
\
- "--enable-server"
\
- "--disable-server"
&&
-config_query_option WESNOTH_OPTS
\
- "Enable compilation of campaign server?"
\
- n
\
- "--enable-campaign-server"
\
- "--disable-campaign-server"
&&
-config_query_option WESNOTH_OPTS
\
- "Enable compilation of map editor?"
\
- n
\
- "--enable-editor"
\
- "--disable-editor"
&&
-config_query_option WESNOTH_OPTS
\
- "Enable compilation of tools for translators and artists?"
\
- n
\
- "--enable-tools"
\
- "--disable-tools"
diff --git a/games-strategy-tbs/wesnoth/DEPENDS
b/games-strategy-tbs/wesnoth/DEPENDS
index e814d92..962679c 100755
--- a/games-strategy-tbs/wesnoth/DEPENDS
+++ b/games-strategy-tbs/wesnoth/DEPENDS
@@ -1,22 +1,38 @@
+depends scons &&
depends pango &&
depends fontconfig &&
depends gettext &&
depends zlib &&
-depends libpng &&
depends sdl &&
depends sdl_image &&
depends sdl_mixer &&
depends sdl_net &&
depends sdl_ttf &&
-depends lua &&
-depends -sub "IOSTREAMS REGEX" boost &&
-
-optional_depends python "--enable-python-install" "" "for Python tools" &&
-optional_depends dbus "--enable-dbus" "--disable-dbus" \
- "Enable DBus support?" &&
-optional_depends fribidi "--with-fribidi" "--without-fribidi" \
- "Enable fribidi support?" &&
+depends lua51 &&
+depends -sub "IOSTREAMS REGEX SERIALIZATION PROGRAM_OPTIONS SYSTEM THREAD"
boost &&

if [[ $WESNOTH_XDELTA == y ]]; then
depends xdelta
-fi
+fi &&
+
+#optional_depends python "--enable-python-install" "" "for Python tools" &&
+
+optional_depends dbus \
+ "notifications=yes" "notifications=no" \
+ "Enable support for desktop notifications?" &&
+
+optional_depends ccache \
+ "ccache=yes" "ccache=no" \
+ "Build with ccache?" &&
+
+optional_depends distcc \
+ "distcc=yes" "distcc=no" \
+ "Build with distcc?" &&
+
+optional_depends gettext \
+ "nls=yes" "nls=no" \
+ "Enable gettext mesage catalogs?" &&
+
+optional_depends fribidi \
+ "fribidi=yes" "fribidi=no" \
+ "Enable fribidi support?"
diff --git a/games-strategy-tbs/wesnoth/DETAILS
b/games-strategy-tbs/wesnoth/DETAILS
index 852029a..cb11697 100755
--- a/games-strategy-tbs/wesnoth/DETAILS
+++ b/games-strategy-tbs/wesnoth/DETAILS
@@ -1,21 +1,19 @@
SPELL=wesnoth
-if [[ $WESNOTH_DEVEL == y ]]; then
- VERSION=1.9.2
+if [ "$WESNOTH_DEVEL" == "y" ]; then
+ VERSION=1.10.1
SOURCE=$SPELL-$VERSION.tar.bz2
- OLD_VERSION=${OLD_VERSION:-1.9.0}
- # this is always the hash for the $VERSION tarball
- SOURCE_GPG=gurus.gpg:$SOURCE.sig
+ OLD_VERSION=${OLD_VERSION:-1.10}
else
- VERSION=1.8.5
+ VERSION=1.10.1
SOURCE=$SPELL-$VERSION.tar.bz2
- OLD_VERSION=${OLD_VERSION:-1.8.4}
- SOURCE_GPG=gurus.gpg:$SOURCE.sig
+ OLD_VERSION=${OLD_VERSION:-1.10}
fi
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig
# 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_URL[0]=$SOURCEFORGE_URL/$SPELL-$VERSION/$SOURCE
SOURCE_URL[1]=http://www.wesnoth.org/files/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
diff --git a/games-strategy-tbs/wesnoth/HISTORY
b/games-strategy-tbs/wesnoth/HISTORY
index f7a5b5d..faa7039 100644
--- a/games-strategy-tbs/wesnoth/HISTORY
+++ b/games-strategy-tbs/wesnoth/HISTORY
@@ -1,3 +1,13 @@
+2012-03-03 Robin Cook <rcook AT wyrms.net>
+ * BUILD: changed to SCONS build
+ * CONFIGURE: changed to new build options
+ * DEPENDS: added scons, removed libpng, changed to lua51, added boost
subdepends
+ changed to SCONS build options
+ * DETAILS: updated 1.10.1
+ * INSTALL: changed to SCONS install
+ * PRE_BUILD: removed autogen.sh
+ * desktop: changed icon location
+
2010-12-14 Ismael Luceno <ismael AT sourcemage.org>
* wesnoth.desktop: added Spanish translation

diff --git a/games-strategy-tbs/wesnoth/INSTALL
b/games-strategy-tbs/wesnoth/INSTALL
index 1cd0242..6f1e102 100755
--- a/games-strategy-tbs/wesnoth/INSTALL
+++ b/games-strategy-tbs/wesnoth/INSTALL
@@ -1,13 +1,2 @@
-if [[ $WESNOTH_DEVEL == y ]]; then
- icon=game-icon
-else
- icon=wesnoth-icon-small
-fi
-
-default_install &&
-
-message "Trying to install icon" &&
- install -d -v $INSTALL_ROOT/usr/share/games/icons &&
- install -v -m 644 $SOURCE_DIRECTORY/images/$icon.png \
- $INSTALL_ROOT/usr/share/games/icons/wesnoth-icon.png &&
-message "End of installing icon"
+scons install &&
+scons install-pytools
diff --git a/games-strategy-tbs/wesnoth/PRE_BUILD
b/games-strategy-tbs/wesnoth/PRE_BUILD
index f2c4cdc..d76aaf2 100755
--- a/games-strategy-tbs/wesnoth/PRE_BUILD
+++ b/games-strategy-tbs/wesnoth/PRE_BUILD
@@ -1,7 +1,9 @@
-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 &&
-cd $SOURCE_DIRECTORY &&
-NOCONFIGURE=Y ./autogen.sh
+if [ "$WESNOTH_DEVEL" == "y" ]; then
+ default_pre_build
+else
+ 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
+fi
diff --git a/games-strategy-tbs/wesnoth/desktop/wesnoth.desktop
b/games-strategy-tbs/wesnoth/desktop/wesnoth.desktop
index 8c98f77..2829841 100644
--- a/games-strategy-tbs/wesnoth/desktop/wesnoth.desktop
+++ b/games-strategy-tbs/wesnoth/desktop/wesnoth.desktop
@@ -34,7 +34,7 @@ Comment[fr]=Un jeu de stratégie au tour par tour dans un
univers fantastique
Comment[hu]=Egy körökre osztott fantasy stratégia
Comment[ru]=Фан�а��и�е�ка� по�агова� ���а�еги�
Comment[sk]=Ťahová strategická hra z prostredia fantasy
-Icon=wesnoth-icon.png
+Icon=/usr/share/games/icons/wesnoth-icon.png
Terminal=false
FilePattern=wesnoth
TryExec=wesnoth
diff --git a/games-strategy-tbs/wesnoth/wesnoth-1.10.1.tar.bz2.sig
b/games-strategy-tbs/wesnoth/wesnoth-1.10.1.tar.bz2.sig
new file mode 100644
index 0000000..c45012b
Binary files /dev/null and
b/games-strategy-tbs/wesnoth/wesnoth-1.10.1.tar.bz2.sig differ
diff --git a/games-strategy-tbs/wesnoth/wesnoth-1.8.5.tar.bz2.sig
b/games-strategy-tbs/wesnoth/wesnoth-1.8.5.tar.bz2.sig
deleted file mode 100644
index 98a57fa..0000000
Binary files a/games-strategy-tbs/wesnoth/wesnoth-1.8.5.tar.bz2.sig and
/dev/null differ
diff --git a/games-strategy-tbs/wesnoth/wesnoth-1.9.2.tar.bz2.sig
b/games-strategy-tbs/wesnoth/wesnoth-1.9.2.tar.bz2.sig
deleted file mode 100644
index 4e2e8e9..0000000
Binary files a/games-strategy-tbs/wesnoth/wesnoth-1.9.2.tar.bz2.sig and
/dev/null differ



  • [SM-Commit] GIT changes to master games grimoire by Robin Cook (ee45186179a5347a3b3c5bd4e903b08197bb6c26), Robin Cook, 03/03/2012

Archive powered by MHonArc 2.6.24.

Top of Page