Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master games grimoire by Vlad Glagolev 
<stealth AT sourcemage.org>:

 dev/null                                            |binary
 games-strategy-tbs/wesnoth/BUILD                    |   12 ---
 games-strategy-tbs/wesnoth/CONFIGURE                |   77 
+++++++++++++++-----
 games-strategy-tbs/wesnoth/DEPENDS                  |   47 ++++++------
 games-strategy-tbs/wesnoth/DETAILS                  |   10 +-
 games-strategy-tbs/wesnoth/HISTORY                  |   12 +++
 games-strategy-tbs/wesnoth/INSTALL                  |    2 
 games-strategy-tbs/wesnoth/PRE_BUILD                |    2 
 games-strategy-tbs/wesnoth/desktop/wesnoth.desktop  |   42 ----------
 games-strategy-tbs/wesnoth/wesnoth-1.12.tar.bz2.sig |binary
 10 files changed, 104 insertions(+), 100 deletions(-)

New commits:
commit 6f5f86ccb271c4b134b1c70d9e3b3988e3a7a129
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    wesnoth: => 1.12

diff --git a/games-strategy-tbs/wesnoth/BUILD 
b/games-strategy-tbs/wesnoth/BUILD
index 3ea8326..e18a7d4 100755
--- a/games-strategy-tbs/wesnoth/BUILD
+++ b/games-strategy-tbs/wesnoth/BUILD
@@ -1,10 +1,4 @@
-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"  &&
+OPTS="-DBINDIR=$INSTALL_ROOT/usr/games \
+      $WESNOTH_OPTS" &&
 
-WESNOTH_OPTS="jobs=${MAKE_NJOBS} verbose=yes"  && 
-
-scons $WESNOTH_BUILD $WESNOTH_PATHS $WESNOTH_OPTS $OPTS
+cmake_build
diff --git a/games-strategy-tbs/wesnoth/CONFIGURE 
b/games-strategy-tbs/wesnoth/CONFIGURE
index d9811dd..768446f 100755
--- a/games-strategy-tbs/wesnoth/CONFIGURE
+++ b/games-strategy-tbs/wesnoth/CONFIGURE
@@ -1,25 +1,66 @@
-config_query_option WESNOTH_BUILD                                     \
-                    "Build wesnoth game?" y                           \
-                    "wesnoth" ""                                      &&
+# remove obsolete options
+list_remove "WESNOTH_OPTS" "static=yes" &&
+list_remove "WESNOTH_OPTS" "static=no" &&
 
-config_query_option WESNOTH_BUILD                                     \
-                    "Build wesnoth server?" y                         \
-                    "wesnothd server_uid=daemon server_gid=games" ""  &&
+# backport legacy options
+if [[ -n "$WESNOTH_BUILD" ]]; then
+  persistent_add WESNOTH_OPTS &&
 
-config_query_option WESNOTH_BUILD                                     \
-                    "Build campaign server?" n                        \
-                    "campaignd" ""                                    &&
+  if list_find "$WESNOTH_BUILD" "wesnoth"; then
+    list_add "WESNOTH_OPTS" "-DENABLE_GAME=ON"
+  else
+    list_add "WESNOTH_OPTS" "-DENABLE_GAME=OFF"
+  fi &&
 
-config_query_option WESNOTH_BUILD                                     \
-                    "Build exploder tool?" n                          \
-                    "exploder" ""                                     &&
+  if list_find "$WESNOTH_BUILD" "wesnothd"; then
+    list_add "WESNOTH_OPTS" "-DENABLE_SERVER=ON -DSERVER_UID=daemon 
-DSERVER_GID=games"
+  else
+    list_add "WESNOTH_OPTS" "-DENABLE_SERVER=OFF"
+  fi &&
 
-config_query_option WESNOTH_BUILD                                     \
-                    "Build cutter tool?" n                            \
-                    "cutter" ""                                       &&
+  if list_find "$WESNOTH_BUILD" "campaignd"; then
+    list_add "WESNOTH_OPTS" "-DENABLE_CAMPAIGN_SERVER=ON"
+  else
+    list_add "WESNOTH_OPTS" "-DENABLE_CAMPAIGN_SERVER=OFF"
+  fi &&
 
-config_query_option WESNOTH_OPTS                                      \
-                    "Enable static building of wesnoth?" n            \
-                    "static=yes" "static=no"                
+  if list_find "$WESNOTH_BUILD" "exploder" || list_find "$WESNOTH_BUILD" 
"cutter"; then
+    list_add "WESNOTH_OPTS" "-DENABLE_TOOLS=ON"
+  else
+    list_add "WESNOTH_OPTS" "-DENABLE_TOOLS=OFF"
+  fi &&
 
+  persistent_remove WESNOTH_BUILD
+fi &&
 
+config_query_option WESNOTH_OPTS "Build wesnoth game?" y \
+                                 "-DENABLE_GAME=ON" \
+                                 "-DENABLE_GAME=OFF" &&
+
+config_query_option WESNOTH_OPTS "Build wesnoth server?" y \
+                                 "-DENABLE_SERVER=ON -DSERVER_UID=daemon 
-DSERVER_GID=games" \
+                                 "-DENABLE_SERVER=OFF" &&
+
+config_query_option WESNOTH_OPTS "Build campaign server?" n \
+                                 "-DENABLE_CAMPAIGN_SERVER=ON" \
+                                 "-DENABLE_CAMPAIGN_SERVER=OFF" &&
+
+config_query_option WESNOTH_OPTS "Build tools for artists and WML 
maintainers?" n \
+                                 "-DENABLE_TOOLS=ON" \
+                                 "-DENABLE_TOOLS=OFF" &&
+
+config_query_option WESNOTH_OPTS "Enable installation of desktop entry 
files?" y \
+                                 "-DENABLE_DESKTOP_ENTRY=ON" \
+                                 "-DENABLE_DESKTOP_ENTRY=OFF" &&
+
+config_query_option WESNOTH_OPTS "Enable building of translations?" y \
+                                 "-DENABLE_NLS=ON" \
+                                 "-DENABLE_NLS=OFF" &&
+
+config_query_option WESNOTH_OPTS "Build unit tests?" n \
+                                 "-DENABLE_TESTS=ON" \
+                                 "-DENABLE_TESTS=OFF" &&
+
+config_query_option WESNOTH_OPTS "Reduce memory usage by removing extra 
functionality?" n \
+                                 "-DENABLE_LOW_MEM=ON" \
+                                 "-DENABLE_LOW_MEM=OFF"
diff --git a/games-strategy-tbs/wesnoth/DEPENDS 
b/games-strategy-tbs/wesnoth/DEPENDS
index 962679c..a314d98 100755
--- a/games-strategy-tbs/wesnoth/DEPENDS
+++ b/games-strategy-tbs/wesnoth/DEPENDS
@@ -1,38 +1,39 @@
-depends scons      &&
+depends cmake      &&
 depends pango      &&
 depends fontconfig &&
+# for libintl
 depends gettext    &&
 depends zlib       &&
+depends bzip2      &&
+depends libvorbis  &&
 depends sdl        &&
 depends sdl_image  &&
 depends sdl_mixer  &&
 depends sdl_net    &&
 depends sdl_ttf    &&
-depends lua51      &&
-depends -sub "IOSTREAMS REGEX SERIALIZATION PROGRAM_OPTIONS SYSTEM THREAD" 
boost &&
+depends lua        &&
+
+# TODO: add ASIO sub-dependency to boost spell
+if list_find "$WESNOTH_OPTS" "-DENABLE_TESTS=ON"; then
+  depends -sub "IOSTREAMS REGEX SERIALIZATION PROGRAM_OPTIONS SYSTEM THREAD 
LOCALE FILESYSTEM TEST" boost
+else
+  depends -sub "IOSTREAMS REGEX SERIALIZATION PROGRAM_OPTIONS SYSTEM THREAD 
LOCALE FILESYSTEM" boost
+fi &&
+
+if list_find "$WESNOTH_OPTS" "-DENABLE_TOOLS=ON"; then
+  depends libpng
+fi &&
 
 if [[ $WESNOTH_XDELTA == y ]]; then
   depends xdelta
 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 dbus \
+                 "-DENABLE_NOTIFICATIONS=ON" \
+                 "-DENABLE_NOTIFICATIONS=OFF" \
+                 "for desktop notifications" &&
 
-optional_depends fribidi                                      \
-                 "fribidi=yes" "fribidi=no"                   \
-                 "Enable fribidi support?"                    
+optional_depends fribidi \
+                 "-DENABLE_FRIBIDI=ON" \
+                 "-DENABLE_FRIBIDI=OFF" \
+                 "for FriBIDI support"
diff --git a/games-strategy-tbs/wesnoth/DETAILS 
b/games-strategy-tbs/wesnoth/DETAILS
index cb11697..f66d99c 100755
--- a/games-strategy-tbs/wesnoth/DETAILS
+++ b/games-strategy-tbs/wesnoth/DETAILS
@@ -1,12 +1,12 @@
            SPELL=wesnoth
 if [ "$WESNOTH_DEVEL" == "y" ]; then
-         VERSION=1.10.1
+         VERSION=1.12
           SOURCE=$SPELL-$VERSION.tar.bz2
-     OLD_VERSION=${OLD_VERSION:-1.10}
+     OLD_VERSION=${OLD_VERSION:-$VERSION}
 else
-         VERSION=1.10.1
+         VERSION=1.12
           SOURCE=$SPELL-$VERSION.tar.bz2
-     OLD_VERSION=${OLD_VERSION:-1.10}
+     OLD_VERSION=${OLD_VERSION:-$VERSION}
 fi
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
 # check that we have the previous tarball first and if so, enable xdelta
@@ -15,7 +15,7 @@ if [[ $WESNOTH_XDELTA == y && -e 
$SOURCE_CACHE/$SPELL-$OLD_VERSION.tar.bz2 ]]; t
 fi
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL-$VERSION/$SOURCE
    SOURCE_URL[1]=http://www.wesnoth.org/files/$SOURCE
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION}.0"
       LICENSE[0]=GPL
         WEB_SITE=http://www.wesnoth.org/
          ENTERED=20040509
diff --git a/games-strategy-tbs/wesnoth/HISTORY 
b/games-strategy-tbs/wesnoth/HISTORY
index faa7039..5545f8d 100644
--- a/games-strategy-tbs/wesnoth/HISTORY
+++ b/games-strategy-tbs/wesnoth/HISTORY
@@ -1,3 +1,15 @@
+2014-11-27 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.12; simplified OLD_VERSION expansion;
+         updated SOURCE_DIRECTORY
+       * CONFIGURE: updated options; switched to cmake
+       * DEPENDS: removed distcc, ccache; switched to cmake: removed scons;
+         lua51 -> lua; added missing libvorbis; returned back libpng; moved
+         NLS setting to CONFIGURE; added bzip2
+       * BUILD: switched to cmake build
+       * INSTALL: dropped
+       * PRE_BUILD: removed extra space
+       * desktop: dropped, replaced by upstream version
+
 2012-03-03 Robin Cook <rcook AT wyrms.net>
        * BUILD: changed to SCONS build
        * CONFIGURE: changed to new build options
diff --git a/games-strategy-tbs/wesnoth/INSTALL 
b/games-strategy-tbs/wesnoth/INSTALL
deleted file mode 100755
index 6f1e102..0000000
--- a/games-strategy-tbs/wesnoth/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-scons install          &&
-scons install-pytools  
diff --git a/games-strategy-tbs/wesnoth/PRE_BUILD 
b/games-strategy-tbs/wesnoth/PRE_BUILD
index d76aaf2..0d1f4e7 100755
--- a/games-strategy-tbs/wesnoth/PRE_BUILD
+++ b/games-strategy-tbs/wesnoth/PRE_BUILD
@@ -5,5 +5,5 @@ else
      # override SOURCE, so the new tarball gets checked, not the xdelta
      SOURCE=$SPELL-$VERSION.tar.bz2
    fi &&
-   default_pre_build 
+   default_pre_build
 fi
diff --git a/games-strategy-tbs/wesnoth/desktop/wesnoth.desktop 
b/games-strategy-tbs/wesnoth/desktop/wesnoth.desktop
deleted file mode 100644
index 2829841..0000000
--- a/games-strategy-tbs/wesnoth/desktop/wesnoth.desktop
+++ /dev/null
@@ -1,42 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=Battle for Wesnoth
-Name[af]=Die Stryd vir Wesnoth
-Name[ca]=Batalla per Wesnoth
-Name[dk]=Kampen om Wesnoth
-Name[es]=Batalla por Wesnoth
-Name[eu]=Wesnotheko Guda
-Name[fr]=La Bataille pour Wesnoth
-Name[hu]=Harc Wesnoth-ért
-Name[ru]=�и�ва за �е�но�
-Name[sk]=Bitka o Wesnoth
-GenericName=Strategy Game
-GenericName[af]=Strategie-spel
-GenericName[ca]=Joc d'estrategia
-GenericName[de]=Strategiespiel
-GenericName[dk]=Strategi-spil
-GenericName[es]=Juego de estrategia
-GenericName[eu]=Estrategiako jokoa
-GenericName[fr]=Jeu de stratégie
-GenericName[hu]=Stratégia
-GenericName[ru]=С��а�еги�е�ка� иг�а
-GenericName[sk]=Strategická hra
-Comment=A fantasy turn-based strategy game
-Comment[af]='n Fantasie beurt-basis strategie-spel
-Comment[ca]=Un joc fantàstic d'estrategia per torns
-Comment[de]=Rundenbasiertes Strategiespiel im Fantasyszenario
-Comment[dk]=Et fantasy træk-baseret strategi-spil
-Comment[es]=Un juego fantástico de estrategia por turnos
-Comment[eu]=Giro fantastikoan eta txandetan oinarritutako estrategia jokoa
-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=/usr/share/games/icons/wesnoth-icon.png
-Terminal=false
-FilePattern=wesnoth
-TryExec=wesnoth
-Exec=wesnoth
-Categories=Application;Game;
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
deleted file mode 100644
index c45012b..0000000
Binary files a/games-strategy-tbs/wesnoth/wesnoth-1.10.1.tar.bz2.sig and 
/dev/null differ
diff --git a/games-strategy-tbs/wesnoth/wesnoth-1.12.tar.bz2.sig 
b/games-strategy-tbs/wesnoth/wesnoth-1.12.tar.bz2.sig
new file mode 100644
index 0000000..a248082
Binary files /dev/null and 
b/games-strategy-tbs/wesnoth/wesnoth-1.12.tar.bz2.sig differ