From 1a9dd62e22bd913517ff2304481f8a094c63eebe Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Wed, 10 Jul 2013 12:55:12 +0200
Subject: [PATCH 1/2] ortp: gcc 4.8 fails to compile this module because of a
 wrong memset

---
 .../ortp/files/compile-fixes-newer-gcc.diff         | 13 +++++++++++++
 recipes-misc/ortp/ortp_0.16.5.bb                    |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 recipes-misc/ortp/files/compile-fixes-newer-gcc.diff

diff --git a/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff b/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff
new file mode 100644
index 0000000000..94ddde0bf8
--- /dev/null
+++ b/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)
+    {
diff --git a/recipes-misc/ortp/ortp_0.16.5.bb b/recipes-misc/ortp/ortp_0.16.5.bb
index 55e945815f..79996a20ce 100644
--- a/recipes-misc/ortp/ortp_0.16.5.bb
+++ b/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"

From f608e7e4f9bb45905839f4313a7e63b4de7e7b32 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Thu, 1 Aug 2013 19:38:32 +0200
Subject: [PATCH 2/2] libosmocore/libosmo-abis: Update libosmo-abis to an
 experimental branch

Update libosmocore to 0.6.2+git and the libosmo-abis to a branch
useful for the osmo-bts.
---
 conf/layer.conf                                  | 2 +-
 recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 2 +-
 recipes-osmocom/libosmocore/libosmocore_git.bb   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index ada915b121..30dfe59761 100644
--- a/conf/layer.conf
+++ b/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"
diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
index 0e521bd84c..ab184df03a 100644
--- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
+++ b/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"
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb
index f35cf4f2da..68c64bd752 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/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"