Merge commit 'f608e7e4f9bb45905839f4313a7e63b4de7e7b32' into edison

meta-telephony/conf/layer.conf

@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony"
 BBFILE_PATTERN_telephony = "^${LAYERDIR}/"
 BBFILE_PRIORITY_telephony = "5"
 
-META_TELEPHONY_OSMO_INC = "8"
+META_TELEPHONY_OSMO_INC = "9"

meta-telephony/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff

@@ -0,0 +1,13 @@
+Index: ortp-0.16.5/src/stun.c
+===================================================================
+--- ortp-0.16.5.orig/src/stun.c
++++ ortp-0.16.5/src/stun.c
+@@ -399,7 +399,7 @@ stunParseMessage( char* buf, unsigned in
+    char* body;
+    unsigned int size;
+ 	 ortp_debug("stun: Received stun message: %i bytes\n", bufLen);
+-   memset(msg, 0, sizeof(msg));
++   memset(msg, 0, sizeof(*msg));
+ 	
+    if (sizeof(StunMsgHdr) > bufLen)
+    {

meta-telephony/recipes-misc/ortp/ortp_0.16.5.bb

@@ -1,8 +1,9 @@
 require ortp.inc
 DEPENDS = "glib-2.0 "
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
-SRC_URI += "file://0001-fix-unused-variables.patch;patch=1"
+SRC_URI += "file://0001-fix-unused-variables.patch;patch=1 \
+            file://compile-fixes-newer-gcc.diff"
 
 SRC_URI[md5sum] = "94546901d14b85f97342f4ecf39489b1"
 SRC_URI[sha256sum] = "3b655a79f9122afd298e9cd702e542908bbd6ea1337c02553110c57e0b3c5835"

meta-telephony/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb

@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "d426d458ca96ba29793e35b1b2a73fbcb3b2c888"
+SRCREV = "f1febda826b87ac78a4cc33504159cc7821e3190"
 SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
 PV = "0.1.3+gitr${SRCPV}"
 PR = "${INC_PR}.2"

meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb

@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "1a02cfc24d2c812ba13e5aa936588be447bb24af"
+SRCREV = "a652abc5bf75435ba7f1c96ed914cf5805fc326f"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git"
-PV = "0.6.0+gitr${SRCPV}"
+PV = "0.6.2+gitr${SRCPV}"
 PR = "2"