Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

14 files changed, 52 insertions, 18 deletions

diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index 33f05bcaa3..ba8cdac1f5 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -23,6 +23,7 @@ SRCREV_pn-libascenario = "${AUTOREV}"
 SRCREV_pn-libeflvala = "${AUTOREV}"
 SRCREV_pn-libfsobasics = "${AUTOREV}"
 SRCREV_pn-libfsoframework = "${AUTOREV}"
+SRCREV_pn-libfsoresource = "${AUTOREV}"
 SRCREV_pn-libfsotransport = "${AUTOREV}"
 SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
 SRCREV_pn-libfso-glib = "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index aef87a62a5..b86963ff29 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 ?= "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
+FSO_CORNUCOPIA_SRCREV ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
 SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}"
@@ -10,7 +10,9 @@ SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-misc-vapi ?= "${FSO_CORNUCOPIA_SRCREV}"
+
 # FSO Projects -- Misc
 SRCREV_pn-dbus-hlid ?= "39e804f28808247df2573788cb99897d4d765e69"
 SRCREV_pn-frameworkd ?= "a2dfde0fb46a745f5c07e6a1ab44e4b95b7dde80"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e30a3c3e12..1d84e96ce4 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -197,7 +197,7 @@ SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f"
 SRCREV_pn-paroli ?= "9279b50ed72a94100d7f0f49090043134302f2eb"
 SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pty-forward-native ?= "4907"
+SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
 SRCREV_pn-pyefl-sudoku ?= "49"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-python-coherence ?= "1161"
@@ -216,7 +216,7 @@ SRCREV_pn-remoko ?= "121"
 SRCREV_pn-remoko-server ?= "121"
 SRCREV_pn-s3c24xx-gpio ?= "4949"
 SRCREV_pn-s3c64xx-gpio ?= "4949"
-SRCREV_pn-serial-forward ?= "4907"
+SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-socketcan-modules ?= "917"
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 06aecf7415..1b01241e4c 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${SRCREV}"
diff --git a/recipes/freesmartphone/fsogpsd_git.bb b/recipes/freesmartphone/fsogpsd_git.bb
new file mode 100644
index 0000000000..1e3f5718ed
--- /dev/null
+++ b/recipes/freesmartphone/fsogpsd_git.bb
@@ -0,0 +1,6 @@
+require cornucopia.inc
+inherit fso-plugin
+PR = "${INC_PR}.0"
+PV = "0.0.0+gitr${SRCREV}"
+
+DEPENDS += "libfsoresource"
diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb
index f7e12e9d63..d5067145d2 100644
--- a/recipes/freesmartphone/fsogsmd_git.bb
+++ b/recipes/freesmartphone/fsogsmd_git.bb
@@ -1,4 +1,6 @@
 require cornucopia.inc
 inherit fso-plugin
 PR = "${INC_PR}.0"
+PV = "0.1.0+gitr${SRCREV}"
 
+DEPENDS += "libfsoresource libgsm0710mux"
diff --git a/recipes/freesmartphone/libfso-glib_git.bb b/recipes/freesmartphone/libfso-glib_git.bb
index 3bf1b39b69..529b7cdc36 100644
--- a/recipes/freesmartphone/libfso-glib_git.bb
+++ b/recipes/freesmartphone/libfso-glib_git.bb
@@ -3,8 +3,7 @@ AUTHOR = "Didier 'Ptitjes"
 LICENSE = "LGPL"
 SECTION = "devel"
 DEPENDS = "vala-native vala-dbus-binding-tool-native dbus-glib glib-2.0 fso-specs"
-# remove the x on next version bump
-PV = "0.2.1+gitr${SRCREV}"
+PV = "0.2.2+gitr${SRCREV}"
 PR = "r0"
 
 inherit autotools_stage pkgconfig vala
diff --git a/recipes/php/php-5.2.6/string.c.patch b/recipes/php/php-5.2.6/string.c.patch
new file mode 100644
index 0000000000..a24b887ac2
--- /dev/null
+++ b/recipes/php/php-5.2.6/string.c.patch
@@ -0,0 +1,21 @@
+Index: php-5.2.6/ext/standard/string.c
+===================================================================
+--- php-5.2.6.orig/ext/standard/string.c
++++ php-5.2.6/ext/standard/string.c
+@@ -592,14 +592,12 @@ PHP_FUNCTION(nl_langinfo)
+ #endif
+ #ifdef DECIMAL_POINT
+ 		case DECIMAL_POINT:
+-#endif
+-#ifdef RADIXCHAR
++#elif RADIXCHAR
+ 		case RADIXCHAR:
+ #endif
+ #ifdef THOUSANDS_SEP
+ 		case THOUSANDS_SEP:
+-#endif
+-#ifdef THOUSEP
++#elif THOUSEP
+ 		case THOUSEP:
+ #endif
+ #ifdef GROUPING
diff --git a/recipes/php/php.inc b/recipes/php/php.inc
index e9d49a3269..0f9a42077a 100644
--- a/recipes/php/php.inc
+++ b/recipes/php/php.inc
@@ -10,7 +10,7 @@ S = "${WORKDIR}/php-${PV}"
 
 inherit autotools
 
-CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
+CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -D_GNU_SOURCE"
 
 acpaths = ""
 
diff --git a/recipes/php/php_5.2.6.bb b/recipes/php/php_5.2.6.bb
index c6cb00fa0f..38e86568d8 100644
--- a/recipes/php/php_5.2.6.bb
+++ b/recipes/php/php_5.2.6.bb
@@ -2,9 +2,10 @@ require php.inc
 
 DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native"
 
-PR = "r5"
+PR = "r6"
 
-SRC_URI += "file://pear-makefile.patch;patch=1 "
+SRC_URI += "file://pear-makefile.patch;patch=1 \
+	file://string.c.patch;patch=1 "
 
 export THREADS="pthread"
 export LIBS=" -lpthread "
diff --git a/recipes/pulseaudio/libcanberra_0.17.bb b/recipes/pulseaudio/libcanberra_0.17.bb
index 30b645ddd9..a0b63069f1 100644
--- a/recipes/pulseaudio/libcanberra_0.17.bb
+++ b/recipes/pulseaudio/libcanberra_0.17.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name \
 Specifications, for generating event sounds on free desktops."
 LICENSE = "LGPL"
-DEPENDS = "alsa-lib gstreamer gtk+ libvorbis pulseaudio"
+DEPENDS = "alsa-lib gstreamer gtk+ libtool libvorbis"
 SECTION = "libs/multimedia"
 AUTHOR = "Lennart Poettering"
 HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra"
-PR = "r1"
+PR = "r2"
 
 inherit autotools_stage vala
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
diff --git a/recipes/serial-utils/pty-forward-native.bb b/recipes/serial-utils/pty-forward-native.bb
index 54ff591928..c613276645 100644
--- a/recipes/serial-utils/pty-forward-native.bb
+++ b/recipes/serial-utils/pty-forward-native.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Receive a forwarded serial from serial-forward and provide a PTY"
 AUTHOR = "Holger 'Zecke' Freyther"
 LICENSE = "GPL"
 SECTION = "console/network"
-PV = "1.0.0+svnr${SRCREV}""
+PV = "1.0.1+gitr${SRCREV}"
 PR = "r0"
 
-SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
-S = "${WORKDIR}/serial_forward"
+SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git"
+S = "${WORKDIR}/git/tools/serial_forward"
 
 inherit native
 
diff --git a/recipes/serial-utils/serial-forward.bb b/recipes/serial-utils/serial-forward.bb
index c3b879a0ee..f5c1b1721d 100644
--- a/recipes/serial-utils/serial-forward.bb
+++ b/recipes/serial-utils/serial-forward.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Forward a serial using TCP/IP"
 AUTHOR = "Holger 'Zecke' Freyther'"
 LICENSE = "GPL"
 SECTION = "console/devel"
-PV = "1.0.0+svnr${SRCREV}"
+PV = "1.0.1+gitr${SRCREV}"
 PR = "r0"
 
-SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
-S = "${WORKDIR}/serial_forward"
+SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git/;protocol=git"
+S = "${WORKDIR}/git/tools/serial_forward"
 
 do_compile() {
     cd ${S}
diff --git a/recipes/tasks/task-fso2-compliance.bb b/recipes/tasks/task-fso2-compliance.bb
index dbc298d670..0ab234dc5d 100644
--- a/recipes/tasks/task-fso2-compliance.bb
+++ b/recipes/tasks/task-fso2-compliance.bb
@@ -13,8 +13,10 @@ RDEPENDS_${PN} = "\
   libfsobasics \
   libfsotransport \
   libfsoframework \
+  libfsoresource \
   \
   fsodeviced \
+  fsogsmd \
   fsonetworkd \
   fsotimed \
   fsousaged \
@@ -24,7 +26,7 @@ RDEPENDS_${PN} = "\
   fso-gpsd \
 #  fso-monitord \
   connman \
-  connman-scripts \
+#  connman-scripts \
   connman-plugin-bluetooth \
 #  connman-plugin-dhclient \
 #  connman-plugin-dnsproxy \