Merge branch 'fso/milestone5.5' of git@git.openembedded.org:openembedded into fso/milestone5.5

Conflicts:
	conf/distro/include/sane-srcrevs-fso.inc

4 files changed, 18 insertions, 17 deletions

diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 63a4427180..40fca79668 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -1,7 +1,7 @@
 # To be included from sane-srcrevs.inc
 
 # FSO Projects -- Cornucopia
-FSO_CORNUCOPIA_SRCREV ?= "100de0cc8a26be87d4ad1136e4e7c0f9c646fb51"
+FSO_CORNUCOPIA_SRCREV ?= "a6971d699ae244b23af2ec75ded58ce4f74ace93"
 SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
@@ -18,17 +18,17 @@ SRCREV_pn-fso-abyss ?= "8ce3c6e40c4852de7dcca502f65784f6b18ca6bf"
 SRCREV_pn-fso-term ?= "e0d92222e3e5a62025089c60a625f1836c510915"
 SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
-SRCREV_pn-fso-monitord ?= "6fa238c3a058b2629b36c03c2b2088eed79fefef"
-SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
-SRCREV_pn-fso-specs ?= "0a08844fc4189cb70f84954681bb19eefb4d1c00"
-SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
+SRCREV_pn-fso-monitord ?= "eb8fb32d52d19c5aa9284c6cc540dd40bb924c9d"
+SRCREV_pn-fso-sounds ?= "cc46b55131fc07a415bf1bd62ce98f73344489cb"
+SRCREV_pn-fso-specs ?= "66c992afd6c551ffd8fc63d7201c5cce269a4d77"
+SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
 SRCREV_pn-libascenario ?= "7508c23e6b28adb3085d2f0f4a2eed2ca98025ea"
 SRCREV_pn-libeflvala ?= "c566847e000fad132225aefd854b81ae713eaa82"
-SRCREV_pn-libfso-glib ?= "fa4eb4fed7ddf55d33e51981a835f6f4952e1549"
-SRCREV_pn-libframeworkd-glib ?= "703017c8f874a325d917931378071c614597110e"
+SRCREV_pn-libfso-glib ?= "b855b0297ff68bb505a02d9b4b13914ca558cd59"
+SRCREV_pn-libframeworkd-glib ?= "680276e4cddabeb1edd088ddd421f363dd106a50"
 SRCREV_pn-libgsm0710 ?= "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6"
 SRCREV_pn-libgsm0710mux ?= "b74d4615374abb856441e4a416726fb3e8d7835b"
-FSO_PYTHONHELPERS_SRCREV ?= "f15ff7c58946a2fd6ba767628b2fe5d6f46ff9bb"
+FSO_PYTHONHELPERS_SRCREV ?= "6d7f51b5189a00a07d9b88100a565f46fcb62644"
 SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
@@ -37,4 +37,4 @@ SRCREV_pn-fso-apm ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-vala-dbus-binding-tool-native ?= "0d221b688bfb51e0607b7f4e6e03bf96d13d5d44"
 SRCREV_pn-vala-terminal ?= "2f849c5690d834a69f6c0693cc159573b3aa78d"
 SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
-SRCREV_pn-zhone ?= "72d00e7bc606e83d4e18e0d7d88a08d88978f5a4"
+SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0"
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 7dd39549bb..2fa278d2e9 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -1,5 +1,7 @@
 require cornucopia.inc
 inherit fso-plugin
 
-DEPENDS += "alsa-lib libcanberra-alsa"
-PR = "${INC_PR}.2"
+DEPENDS += "alsa-lib"
+RDEPENDS += "libcanberra-alsa"
+RRECOMMENDS += "fso-alsa-data"
+PR = "${INC_PR}.4"
diff --git a/recipes/images/fso-image.inc b/recipes/images/fso-image.inc
index c3774ffecc..b2be138d46 100644
--- a/recipes/images/fso-image.inc
+++ b/recipes/images/fso-image.inc
@@ -36,9 +36,9 @@ AUDIO_INSTALL = "\
   alsa-utils-amixer \
   gst-meta-audio \
   gst-plugin-modplug \
-  gst-plugin-sid \
   ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)} \
   fso-sounds \
+  fso-alsa-data \
 "
 
 GTK_INSTALL = "\
@@ -80,7 +80,6 @@ ZHONE_INSTALL = "\
 # additional apps
 APPS_INSTALL = "\
   cellhunter \
-#  paroli \
   gpe-gallery \
   gpe-sketchbook \
   gpe-filemanager \
diff --git a/recipes/pulseaudio/libcanberra_0.14.bb b/recipes/pulseaudio/libcanberra_0.14.bb
index 04870480d6..f9388e17cf 100644
--- a/recipes/pulseaudio/libcanberra_0.14.bb
+++ b/recipes/pulseaudio/libcanberra_0.14.bb
@@ -5,7 +5,7 @@ DEPENDS = "alsa-lib gstreamer gtk+ libvorbis pulseaudio"
 SECTION = "libs/multimedia"
 AUTHOR = "Lennart Poettering"
 HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra"
-PR = "r0"
+PR = "r1"
 
 inherit autotools_stage
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
@@ -35,15 +35,15 @@ do_configure() {
 OE_LT_RPATH_ALLOW = "any"
 OE_LT_RPATH_ALLOW[export] = "1"
 
-PACKAGES_DYNAMIC = "libcanberra-*"
-
 python populate_packages_prepend() {
 	plugindir = bb.data.expand('${libdir}/${P}/', d)
-	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'lib%s', '%s support library', extra_depends='' )
+	do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' )
 }
 
 PACKAGES =+ "${PN}-gtk"
 
+PACKAGES_DYNAMIC = "libcanberra-*"
+
 FILES_${PN}-gtk = "\
   ${sysconfdir}/gconf \
   ${bindir}/* \