From 569b5104049c992a29a6469c9ca3f1e85ebeb9c8 Mon Sep 17 00:00:00 2001
From: Denis 'Gnutoo' Carikli <GNUtoo@no-log.org>
Date: Fri, 12 Feb 2010 18:47:45 +0100
Subject: wesnoth 1.6.5: package the low campaign in its own package

---
 recipes/wesnoth/wesnoth_1.6.5.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'recipes/wesnoth')

diff --git a/recipes/wesnoth/wesnoth_1.6.5.bb b/recipes/wesnoth/wesnoth_1.6.5.bb
index 4b7b9b67de..cd1a50d2bc 100644
--- a/recipes/wesnoth/wesnoth_1.6.5.bb
+++ b/recipes/wesnoth/wesnoth_1.6.5.bb
@@ -26,7 +26,7 @@ EXTRA_OECMAKE = "\
 PACKAGES = "wesnoth-editor wesnoth-doc wesnoth-music wesnoth-sounds \
 	wesnoth-aoi wesnoth-did wesnoth-ei wesnoth-httt wesnoth-l \
 	wesnoth-nr wesnoth-sof wesnoth-sotbe wesnoth-thot wesnoth-trow \
-	wesnoth-tsg wesnoth-tb wesnoth-utbs \
+	wesnoth-tsg wesnoth-tb wesnoth-utbs wesnoth-low\
 	wesnoth-data \
 	wesnoth-all-campaigns \
 	wesnoth-all \
@@ -66,7 +66,7 @@ RDEPENDS_wesnoth-editor = "wesnoth-data"
 RDEPENDS_wesnoth-all-campaigns = "wesnoth \
 	wesnoth-aoi wesnoth-did wesnoth-ei wesnoth-httt wesnoth-l \
 	wesnoth-nr wesnoth-sof wesnoth-sotbe wesnoth-thot wesnoth-trow \
-	wesnoth-tsg wesnoth-tb wesnoth-utbs"
+	wesnoth-tsg wesnoth-tb wesnoth-utbs wesnoth-low"
 
 # Installing wesnoth-all should pull everything in (like in Debian).
 RDEPENDS_wesnoth-all = "wesnoth wesnoth-sounds wesnoth-music"
@@ -100,6 +100,11 @@ FILES_wesnothd = "\
 	${bindir}/wesnothd \
 "
 
+FILES_wesnoth-low ="\
+       ${datadir}/wesnoth/data/campaigns/Legend_of_Wesmere \
+       ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-aoi.mo \
+"
+
 FILES_wesnoth-editor = "\
 	${bindir}/wesnoth_editor \
 	${datadir}/applications/wesnoth_editor.desktop \
-- 
cgit v1.2.3


From a4124738f4b572c37ff6d082c7decf7387cde1d2 Mon Sep 17 00:00:00 2001
From: Denis 'Gnutoo' Carikli <GNUtoo@no-log.org>
Date: Fri, 12 Feb 2010 18:32:31 +0100
Subject: wesnoth: only compile tiny GUI when screen is smaller than
 800x480(smallgui)

Wesnoth has a compile time option for making it work on smaller screen
  The minimum is 400x300,else you would have to modify
  /usr/share/wesnoth/data/themes/default.cfg to support your resolution.
  Basically it uses imagemagick-native to shrink the graphics,which leads
  to some problems like for instance:
   *Only a flag can be seen instead of a full village
   *The forest look like grass
---
 recipes/wesnoth/wesnoth_1.6.5.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'recipes/wesnoth')

diff --git a/recipes/wesnoth/wesnoth_1.6.5.bb b/recipes/wesnoth/wesnoth_1.6.5.bb
index cd1a50d2bc..3c8a451970 100644
--- a/recipes/wesnoth/wesnoth_1.6.5.bb
+++ b/recipes/wesnoth/wesnoth_1.6.5.bb
@@ -3,7 +3,8 @@ HOMEPAGE = "http://www.wesnoth.org/"
 SECTION = "games"
 LICENSE = "GPL"
 
-DEPENDS = "freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib boost imagemagick-native pango libpng"
+DEPENDS = "freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib boost pango libpng \
+${@base_ifelse(( int(bb.data.getVar('MACHINE_DISPLAY_WIDTH_PIXELS', d, 1) ) < 800 ) or ( int(bb.data.getVar('MACHINE_DISPLAY_HEIGHT_PIXELS',d,1) )< 480 ),"imagemagick-native","")}"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wesnoth/${PN}-${PV}.tar.bz2;name=tarball"
@@ -15,7 +16,7 @@ ARM_INSTRUCTION_SET = "arm"
 inherit cmake
 
 EXTRA_OECMAKE = "\
-	-DGUI=tiny \
+	${@base_ifelse( ( ( int(bb.data.getVar('MACHINE_DISPLAY_WIDTH_PIXELS', d, 1) ) < 800 ) or (  int(bb.data.getVar('MACHINE_DISPLAY_HEIGHT_PIXELS',d,1) ) < 480 ) ),"-DGUI=tiny","")} \
 	-DENABLE_EDITOR=ON \
 	-DENABLE_LOW_MEM=ON \
 	-DENABLE_FRIBIDI=OFF \
-- 
cgit v1.2.3


From 4a0b75c5a0b696b210662c3b15cba223f6b59922 Mon Sep 17 00:00:00 2001
From: Denis 'Gnutoo' Carikli <GNUtoo@no-log.org>
Date: Sat, 13 Feb 2010 09:11:33 +0100
Subject: Revert "wesnoth: only compile tiny GUI when screen is smaller than
 800x480(smallgui)"

This reverts commit a4124738f4b572c37ff6d082c7decf7387cde1d2.

We shouldn't make use of USE flags-like functionalities in non machine feeds,
And we can't put every recipe in machine feed.
I think the best way is to do a wesnoth-highres recipe
---
 recipes/wesnoth/wesnoth_1.6.5.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'recipes/wesnoth')

diff --git a/recipes/wesnoth/wesnoth_1.6.5.bb b/recipes/wesnoth/wesnoth_1.6.5.bb
index 3c8a451970..cd1a50d2bc 100644
--- a/recipes/wesnoth/wesnoth_1.6.5.bb
+++ b/recipes/wesnoth/wesnoth_1.6.5.bb
@@ -3,8 +3,7 @@ HOMEPAGE = "http://www.wesnoth.org/"
 SECTION = "games"
 LICENSE = "GPL"
 
-DEPENDS = "freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib boost pango libpng \
-${@base_ifelse(( int(bb.data.getVar('MACHINE_DISPLAY_WIDTH_PIXELS', d, 1) ) < 800 ) or ( int(bb.data.getVar('MACHINE_DISPLAY_HEIGHT_PIXELS',d,1) )< 480 ),"imagemagick-native","")}"
+DEPENDS = "freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib boost imagemagick-native pango libpng"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wesnoth/${PN}-${PV}.tar.bz2;name=tarball"
@@ -16,7 +15,7 @@ ARM_INSTRUCTION_SET = "arm"
 inherit cmake
 
 EXTRA_OECMAKE = "\
-	${@base_ifelse( ( ( int(bb.data.getVar('MACHINE_DISPLAY_WIDTH_PIXELS', d, 1) ) < 800 ) or (  int(bb.data.getVar('MACHINE_DISPLAY_HEIGHT_PIXELS',d,1) ) < 480 ) ),"-DGUI=tiny","")} \
+	-DGUI=tiny \
 	-DENABLE_EDITOR=ON \
 	-DENABLE_LOW_MEM=ON \
 	-DENABLE_FRIBIDI=OFF \
-- 
cgit v1.2.3