From: Denis 'Gnutoo' Carikli <GNUtoo@no-log.org>
Date: Sat, 13 Feb 2010 08:11:33 +0000 (+0100)
Subject: Revert "wesnoth: only compile tiny GUI when screen is smaller than 800x480(smallgui)"
X-Git-Tag: Release-2010-05/1~491^2~281
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a0b75c5a0b696b210662c3b15cba223f6b59922;p=openembedded.git

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
---

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 \