merge of '1821f6eadefc14ad7ce51d5ab026da139608f557'

     and 'b214e193f52c5b76dce3027376c5bd7eafce9971'

3 files changed, 33 insertions, 6 deletions

diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index ef0fa80f65..c439ad67f6 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -83,7 +83,8 @@ PREFERRED_VERSION_pango            = "1.16.4"
 PREFERRED_VERSION_atk              = "1.18.0"
 PREFERRED_VERSION_gtk+             = "2.10.14"
 
-PREFERRED_VERSION_gnome-vfs        = "2.16"
+PREFERRED_VERSION_gnome-vfs        = "2.16.3"
+
 # 3.9.1 would be correct
 PREFERRED_VERSION_gtkhtml-3.8      = "3.8.2"
 PREFERRED_VERSION_libxml2          = "2.6.27"
@@ -99,12 +100,16 @@ PREFERRED_VERSION_gst-plugins-base = "0.10.14"
 # 0.11.3 would be correct ( + maemo patches)
 PREFERRED_VERSION_gst-ffmpeg       = "0.10.2"
 
+PREFERRED_VERSION_bluez-libs            = "3.20"
+
 PREFERRED_PROVIDER_virtual/db           = "db"
 PREFERRED_PROVIDER_virtual/db-native    = "db-native"
 PREFERRED_PROVIDER_virtual/xserver      = "xserver-kdrive"
 
 # This is a hack to avoid building mesa which crashes the compiler
 PREFERRED_PROVIDER_virtual/libsdl       = "libsdl-directfb"
+PREFERRED_VERSION_libsdl-directfb       = "1.2.9"
+PREFERRED_VERSION_libsdl-image          = "1.2.3"
 
 PREFERRED_PROVIDER_xserver          = "xserver-kdrive"
 
@@ -137,11 +142,6 @@ PREFERRED_VERSION_pixman                  = "0.9.6"
 PREFERRED_PROVIDER_virtual/libqte2	  = "qte-mt"
 PREFERRED_PROVIDER_avahi		  = "avahi"
 
-# Prevent chosing jikes-native (until java bootstrap patch is merged).
-PREFERRED_PROVIDER_virtual/javac-native	  = "ecj-bootstrap-native"
-
-PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
-
 PREFERRED_VERSION_libsoup = "2.2.7"
 PREFERRED_VERSION_libglade = "2.4.2"
 PREFERRED_VERSION_gnutls = "1.4.5"
@@ -150,6 +150,23 @@ PREFERRED_VERSION_libgcrypt = "1.2.3"
 
 PREFERRED_VERSION_gpe-scap = "1.3"
 
+# various Maemo4 specific libraries
+PREFERRED_VERSION_mce-dev = "1.6.3"
+PREFERRED_VERSION_libosso = "2.13"
+PREFERRED_VERSION_libhildon = "1.99.0"
+PREFERRED_VERSION_libhildonmime = "1.10.0"
+PREFERRED_VERSION_libhildonfm = "1.9.46"
+PREFERRED_VERSION_hildon-thumbnail = "0.14"
+PREFERRED_VERSION_osso-gwconnect = "1.0.12"
+PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
+
+# Java stuff 
+
+PREFERRED_PROVIDER_virtual/javac-native	  = "ecj-bootstrap-native"
+
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
+PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
+
 # Does not compile with the CodeSourcery compiler .. :(
 PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
 PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120"
@@ -172,3 +189,11 @@ PKG_hildon-1 = "libhildon1"
 PKG_zlib = "zlib1g"
 PKG_libglade = "libglade2-0"
 PKG_libsoup = "libsoup2.2-8"
+
+PKG_libsdl-image = "libsdl-image1.2"
+PKG_libsdl-directfb = "libsdl1.2"
+
+PKG_bluez-libs = "libbluetooth2"
+
+PKG_osso-ic-oss = "osso-ic"
+PKG_libconic = "libconic0"
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index 0fbd9d1578..4e8f011a1e 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
 require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/tune-xscale.inc
 
 IMAGE_FSTYPES ?= "jffs2"
 
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index d8ea4b8890..914300e31c 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
 
 require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/tune-xscale.inc
 
 IMAGE_FSTYPES ?= "jffs2"