merge of 2117dd5b726765202daffe67318297ef78df5a4f

     and 2913dd5a4db27b7b121a13b703b88a41e73464aa

5 files changed, 17 insertions, 14 deletions

diff --git a/conf/machine/poodle-2.4.conf b/conf/machine/poodle-2.4.conf
index bb3ae039d9..dc603d3bcc 100644
--- a/conf/machine/poodle-2.4.conf
+++ b/conf/machine/poodle-2.4.conf
@@ -1,9 +1,13 @@
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
 
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \
-hostap-modules orinoco-modules sharp-sdmmc-support chkhinge \
+hostap-modules orinoco-modules sharp-sdmmc-support \
 hostap-utils prism3-firmware prism3-support"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
+
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \
 kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
 kernel-module-usbdcore kernel-module-usbdmonitor \
 hostap-utils prism3-firmware prism3-support"
diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/poodle-2.6.conf
index 72a751d19e..7edebad2d3 100644
--- a/conf/machine/poodle-2.6.conf
+++ b/conf/machine/poodle-2.6.conf
@@ -1,5 +1,4 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-PREFERRED_VERSION_orinoco-modules = "0.13e-26"
 
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral hostap-modules orinoco-modules"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils"
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
index cef670b450..3291a00df6 100644
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/zaurus-clamshell-2.4.conf
@@ -2,6 +2,9 @@ PREFERRED_PROVIDERS_append_c7x0  = " virtual/kernel:c7x0-kernels-2.4-embedix"
 PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x"
 PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
 
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
 pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \
 hostap-utils prism3-firmware prism3-support"
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index c2d15dee58..60cc77356a 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -93,14 +93,10 @@ def opie_more_depends(d):
 	else: return " "
 
 def opie_more_rdepends(d):  
-        import bb
-        root_flash_size = int( bb.data.getVar( "ROOT_FLASH_SIZE", d, True ) or "16" )
-        if root_flash_size >= 24: return bb.data.getVar( "OPIE_RDEPENDS_24", d, True )
-        else: return " "
+	import bb
+	root_flash_size = int( bb.data.getVar( "ROOT_FLASH_SIZE", d, True ) or "16" )
+	if root_flash_size >= 24: return bb.data.getVar( "OPIE_RDEPENDS_24", d, True )
+	else: return " "
 
 OPIE_MORE_DEPENDS := "${@opie_more_depends(d)}"
-
-
-
-
-# # OPIE_MORE_RDEPENDS := "${@opie_more_rdepends(d)}"
+OPIE_MORE_RDEPENDS := "${@opie_more_rdepends(d)}"
diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb
index 9afdab203b..1ee4a49936 100644
--- a/packages/mplayer/mplayer-atty_1.1.5.bb
+++ b/packages/mplayer/mplayer-atty_1.1.5.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Open Source multimedia player."
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://atty.jp/?Zaurus%2Fmplayer"
-DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg"
+DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg"
 LICENSE = "GPL"
 RCONFLICTS = "mplayer"
 MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \
 	   file://Makefile.patch;patch=1;pnum=0 \
@@ -65,6 +65,7 @@ EXTRA_OECONF = " \
 	--disable-ipp \
 	--disable-iwmmxt \
         \
+	--enable-freetype \
         --with-extralibdir=${STAGING_LIBDIR} "
 
 EXTRA_OECONF_append_c7x0 = " --enable-w100"