recipes/freesmartphone: sync with shr/merge

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>

7 files changed, 14 insertions, 5 deletions

diff --git a/recipes/freesmartphone/fso-abyss_git.bb b/recipes/freesmartphone/fso-abyss_git.bb
index e098c5fd61..212df92fb6 100644
--- a/recipes/freesmartphone/fso-abyss_git.bb
+++ b/recipes/freesmartphone/fso-abyss_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Abyss is a GSM 07.10 muxer userspace daemon"
 HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/Abyss"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
-DEPENDS = "vala-native dbus dbus-glib libgsm0710mux libfsobasics"
+DEPENDS = "vala-native dbus dbus-glib libgsm0710mux"
 LICENSE = "GPL"
 PV = "0.9.0+gitr${SRCPV}"
 PR = "r1"
diff --git a/recipes/freesmartphone/fso-sounds.bb b/recipes/freesmartphone/fso-sounds.bb
index 98a51c32bf..3277692c57 100644
--- a/recipes/freesmartphone/fso-sounds.bb
+++ b/recipes/freesmartphone/fso-sounds.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A set of notification sounds"
 LICENSE = "CC"
 SECTION = "multimedia"
 PV = "0.0.1+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
   ${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master \
@@ -10,7 +10,8 @@ SRC_URI = "\
 
 do_install() {
 	install -d ${D}${datadir}/sounds/
-	install ${WORKDIR}/git/sounds/*.wav ${D}${datadir}/sounds/
+	install ${WORKDIR}/git/sounds/female_message.wav ${D}${datadir}/sounds/
+	install ${WORKDIR}/git/sounds/female_ringtone.wav ${D}${datadir}/sounds/
 }
 
 FILES_${PN} = "${datadir}"
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 0b26c27865..66e6ef43ad 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -1,7 +1,7 @@
 require cornucopia.inc
 inherit fso-plugin
 
-DEPENDS += "alsa-lib libcanberra"
+DEPENDS += "alsa-lib libcanberra libfsoresource"
 RDEPENDS += "libcanberra-alsa"
 RRECOMMENDS += "fso-alsa-data"
 PV = "0.9.0+gitr${SRCPV}"
diff --git a/recipes/freesmartphone/libfso-glib_git.bb b/recipes/freesmartphone/libfso-glib_git.bb
index c26f60f7c3..498d1f9648 100644
--- a/recipes/freesmartphone/libfso-glib_git.bb
+++ b/recipes/freesmartphone/libfso-glib_git.bb
@@ -6,7 +6,7 @@ DEPENDS = "vala-native vala-dbus-binding-tool-native dbus-glib glib-2.0 fso-spec
 PV = "0.2.1+gitr${SRCPV}"
 PR = "r0"
 
-inherit autotools_stage pkgconfig vala girepository
+inherit autotools_stage pkgconfig vala
 
 SRC_URI = "git://git.freesmartphone.org/libfso-glib.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
diff --git a/recipes/freesmartphone/libfsoresource_git.bb b/recipes/freesmartphone/libfsoresource_git.bb
new file mode 100644
index 0000000000..40b536f293
--- /dev/null
+++ b/recipes/freesmartphone/libfsoresource_git.bb
@@ -0,0 +1,5 @@
+require cornucopia.inc
+DESCRIPTION = "freesmartphone.org dbus resource library"
+DEPENDS += "libfso-glib"
+PV = "0.1.0+gitr${SRCREV}"
+PR = "${INC_PR}.0"
diff --git a/recipes/freesmartphone/mickeydbus_git.bb b/recipes/freesmartphone/mickeydbus_git.bb
index d219dfabf3..c9dc755cb5 100644
--- a/recipes/freesmartphone/mickeydbus_git.bb
+++ b/recipes/freesmartphone/mickeydbus_git.bb
@@ -16,7 +16,9 @@ do_install() {
 
 RDEPENDS_${PN} = "\
   python-dbus \
+  python-pygobject \
   python-pprint \
+  python-xml \
 "
 
 PACKAGE_ARCH_${PN} = "all"
diff --git a/recipes/freesmartphone/misc-vapi_git.bb b/recipes/freesmartphone/misc-vapi_git.bb
index 3b53c44ec6..2950f77b8a 100644
--- a/recipes/freesmartphone/misc-vapi_git.bb
+++ b/recipes/freesmartphone/misc-vapi_git.bb
@@ -1,4 +1,5 @@
 require cornucopia.inc
+DEPENDS = "alsa-lib"
 DEPENDS += "alsa-lib"
 PV = "0.2.0+git${SRCPV}"
 PR = "${INC_PR}.0"