[Lunar-commits] <moonbase> wesnoth: major update to 1.10.2

[Michael 'v4hn' Goerner]

commit e508e05f43ee608505da0c9ffc036c39ea44928e
Author: Michael 'v4hn' Goerner <v4hn at lunar-linux.org>
Date:   Thu Apr 12 20:41:39 2012 +0200

    wesnoth: major update to 1.10.2
    
    changed build system to cmake
---
 games/wesnoth/BUILD     |   14 +++++++++-----
 games/wesnoth/CONFIGURE |   13 +++++--------
 games/wesnoth/DEPENDS   |   21 +++++++++++----------
 games/wesnoth/DETAILS   |    6 +++---
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/games/wesnoth/BUILD b/games/wesnoth/BUILD
index ed9f7ae..4d44048 100644
--- a/games/wesnoth/BUILD
+++ b/games/wesnoth/BUILD
@@ -1,9 +1,13 @@
 (
+  OPTS+=" -DBINDIR=games -DDATAROOTDIR=${MODULE_PREFIX}/share/games/ -DDESKTOPDIR=${MODULE_PREFIX}/share/applications -DICONDIR=${MODULE_PREFIX}/share/pixmaps -DMANDIR=${MODULE_PREFIX}/share/man -DDOCDIR=${MODULE_PREFIX}/doc"
+  #fribidi is obsolete and would require 0.10.*
+  OPTS+=" -DENABLE_FRIBIDI=OFF"
 
-  ./autogen.sh  &&
-  sedit 's:"\${datadir}"/icons:/usr/share/icons:' configure  &&
-  sedit 's:"\${datadir}"/applications:/usr/share/applications:' configure  &&
-  default_game_build  &&
-  gather_docs changelog
+  if ! in_depends pango cairo; then
+    message "${PROBLEM_COLOR}Wesnoth requires pango to be build with cairo backend."
+    message "${PROBLEM_COLOR}Please rebuild pango and select cairo backend."
+    exit 1
+  fi
 
+  default_cmake_build
 ) > $C_FIFO 2>&1
diff --git a/games/wesnoth/CONFIGURE b/games/wesnoth/CONFIGURE
index b992e5e..eaec0be 100644
--- a/games/wesnoth/CONFIGURE
+++ b/games/wesnoth/CONFIGURE
@@ -1,8 +1,5 @@
-mquery WESNOTH_LITE "Enable lite wesnoth?" n "--enable-lite" "--disable-lite"
-mquery WESNOTH_LOWMEM "Enable lowmem wesnoth?" n "--enable-lowmem" "--disable-lowmem"
-mquery WESNOTH_TINYGUI "Enable 320x240 resolution support?" n "--enable-tinygui" "--disable-tinygui"
-mquery WESNOTH_SMALLGUI "Enable 800x480 optimized resolution?" n "--enable-smallgui" "--disable-smallgui"
-mquery WESNOTH_GAME "Build the game?" y "--enable-game" "--disable-game"
-mquery WESNOTH_SERVER "Build the server?" n "--enable-server" "--disable-server"
-mquery WESNOTH_CSERVER "Build the campaign server?" n "--enable-campaign-server" "--disable-campaign-server"
-mquery WESNOTH_TOOLS "Build the developer tools?" n "--enable-tools" "--disable-tools"
+mquery WESNOTH_LOWMEM "Enable lowmem wesnoth?" n "-DENABLE_LOW_MEM=ON" "-DENABLE_LOW_MEM=OFF"
+mquery WESNOTH_GAME "Build the game?" y "-DENABLE_GAME=ON" "-DENABLE_GAME=OFF"
+mquery WESNOTH_SERVER "Build the server?" n "-DENABLE_SERVER=ON" "-DENABLE_SERVER=OFF"
+mquery WESNOTH_CAMPAIN_SERVER "Build the campain server?" n "-DENABLE_CAMPAIN_SERVER=ON" "-DENABLE_CAMPAIN_SERVER=OFF"
+mquery WESNOTH_TOOLS "Build the developer tools?" n "-DENABLE_TOOLS=ON" "-DENABLE_TOOLS=OFF"
diff --git a/games/wesnoth/DEPENDS b/games/wesnoth/DEPENDS
index 062db61..f959fef 100644
--- a/games/wesnoth/DEPENDS
+++ b/games/wesnoth/DEPENDS
@@ -1,14 +1,15 @@
-depends SDL_image
-depends SDL_mixer
-depends SDL_ttf
-depends SDL_net
+depends cmake
 depends boost
-depends lua
+depends fontconfig
+
+depends cairo
+#pango needs to be build with cairo suppport
 depends pango
 
-optional_depends ImageMagick "" "" "if you want support for resolutions smaller than 800x600"
+depends SDL
+depends SDL_image
+depends SDL_mixer
+depends SDL_net
+depends SDL_ttf
 
-optional_depends optipng  \
-                 "--enable-optipng"   \
-                 "--disable-optipng"  \
-                 "for optimizing png size"
+optional_depends dbus "-DENABLE_NOTIFICATIONS=ON" "-DENABLE_NOTIFICATIONS=OFF" "for desktop notifications"
diff --git a/games/wesnoth/DETAILS b/games/wesnoth/DETAILS
index 79b6895..670c866 100644
--- a/games/wesnoth/DETAILS
+++ b/games/wesnoth/DETAILS
@@ -1,12 +1,12 @@
           MODULE=wesnoth
-         VERSION=1.8.6
+         VERSION=1.10.2
           SOURCE=$MODULE-$VERSION.tar.bz2
    SOURCE_URL[0]=$SFORGE_URL/$MODULE
    SOURCE_URL[1]=http://www.wesnoth.org/files
-      SOURCE_VFY=sha1:ade2f88287b5900485646f0ffe3414fa8b695afb
+      SOURCE_VFY=sha1:6a275ee29d53f1e2267afd03b00a12e4d04e8cbc
         WEB_SITE=http://www.wesnoth.org
          ENTERED=20040701
-         UPDATED=20110528
+         UPDATED=20120413
            SHORT="Battle for Wesnoth - fantasy turn-based strategy game"
 
 cat <<EOF