From 507dc57c51981dc7016b49582a99cdabbe68d1df Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 8 Apr 2014 19:30:51 +0200
Subject: [PATCH 01/11] libosmocore/libosmo-abis: Upgrade to 0.6.6 and 0.2.0

Upgrade to versions 0.6.6 and 0.2.0. These change the SO
version of the libraries and provide stability and reliability
fixes.
---
 conf/layer.conf                                  | 2 +-
 recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 4 ++--
 recipes-osmocom/libosmocore/libosmocore_git.bb   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 3490fd1d82..b143ff16d7 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 = "11"
+META_TELEPHONY_OSMO_INC = "12"
diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
index 4bc295a87a..cd398930e0 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 = "f6415ea5a6bfd796c854dc0bace326de26bf26f1"
+SRCREV = "ecd0a36ce8d468985ec296214e3ecced8da487cc"
 SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
-PV = "0.1.6+gitr${SRCPV}"
+PV = "0.2.0+gitr${SRCPV}"
 PR = "${INC_PR}.2"
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb
index f85b89e8d3..a5b695a556 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 = "e47523874da2e79e79f149f433d6a53f230dc30c"
+SRCREV = "0c50b17a2636a4a9d471ebbaf2cdb9396390e4cd"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git"
-PV = "0.6.5+gitr${SRCPV}"
+PV = "0.6.6+gitr${SRCPV}"
 PR = "r0"

From 0eafd5637d31f98fc7946854156ded059b0a7ad2 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 8 Apr 2014 19:43:14 +0200
Subject: [PATCH 02/11] libdbi-drivers: Add fixes for out-of-bounds write in
 the sqlite3 driver

While working on the OpenBSC/NITB schema migration I experienced
crashes and traced it down to libdbi-drivers. It was possible that
a special string quote each character and then adding '"\0' would
result in out of bounds write.
---
 .../libdbi/files/memory-corruption-fixes.patch  | 17 +++++++++++++++++
 recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb   |  4 +++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 recipes-misc/libdbi/files/memory-corruption-fixes.patch

diff --git a/recipes-misc/libdbi/files/memory-corruption-fixes.patch b/recipes-misc/libdbi/files/memory-corruption-fixes.patch
new file mode 100644
index 0000000000..ff42752a44
--- /dev/null
+++ b/recipes-misc/libdbi/files/memory-corruption-fixes.patch
@@ -0,0 +1,17 @@
+This is a backport of a fix from Holger Freyther to the
+libdbd sqlite3 driver.
+
+Index: libdbi-drivers-0.8.3-1/drivers/sqlite3/dbd_sqlite3.c
+===================================================================
+--- libdbi-drivers-0.8.3-1.orig/drivers/sqlite3/dbd_sqlite3.c
++++ libdbi-drivers-0.8.3-1/drivers/sqlite3/dbd_sqlite3.c
+@@ -502,7 +502,8 @@ size_t dbd_quote_binary(dbi_conn_t *conn
+   unsigned char *temp;
+   size_t len;
+ 
+-  if ((temp = malloc(from_length*2)) == NULL) {
++  /* allocate an extra byte for NULL and two for the quotes */
++  if ((temp = malloc(2*from_length+1+2)) == NULL) {
+     return 0;
+   }
+ 
diff --git a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
index 2f2e39df79..deeb56ec3d 100644
--- a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
+++ b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
@@ -1,6 +1,8 @@
 require ${PN}.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI[md5sum] = "4de79b323162a5a7652b65b608eca6cd"
 SRC_URI[sha256sum] = "4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72"
+
+SRC_URI += "file://memory-corruption-fixes.patch"

From 4da2963d82e7bee3045f73448d17395f78f1caf0 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 22 Apr 2014 22:09:48 +0200
Subject: [PATCH 03/11] openbsc: Decrease the version number of MNCC to 2 again

Currently OpenBSC and LCR are not compatible with each other.
So far we have only included patches that add new defines and
do not change the wire format of messages. Just revert it so
we can have LCR talk to OpenBSC
---
 .../openbsc/openbsc/revert-mncc-version.patch | 19 +++++++++++++++++++
 recipes-osmocom/openbsc/openbsc_git.bb        |  5 +++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 recipes-osmocom/openbsc/openbsc/revert-mncc-version.patch

diff --git a/recipes-osmocom/openbsc/openbsc/revert-mncc-version.patch b/recipes-osmocom/openbsc/openbsc/revert-mncc-version.patch
new file mode 100644
index 0000000000..c4c2ee8a46
--- /dev/null
+++ b/recipes-osmocom/openbsc/openbsc/revert-mncc-version.patch
@@ -0,0 +1,19 @@
+OpenBSC has bumped the version from 2 to 4 but only introduced
+new defines so the actual wire protocol has not been changed
+yet. This is why we can just turn the version back. At least I
+hope so.
+
+
+Index: openbsc/include/openbsc/mncc.h
+===================================================================
+--- openbsc.orig/include/openbsc/mncc.h
++++ openbsc/include/openbsc/mncc.h
+@@ -163,7 +163,7 @@ struct gsm_data_frame {
+ 	unsigned char	data[0];
+ };
+ 
+-#define MNCC_SOCK_VERSION	4
++#define MNCC_SOCK_VERSION	2
+ struct gsm_mncc_hello {
+ 	uint32_t	msg_type;
+ 	uint32_t	version;
diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb
index 1bf7bb39dd..7d395ca382 100644
--- a/recipes-osmocom/openbsc/openbsc_git.bb
+++ b/recipes-osmocom/openbsc/openbsc_git.bb
@@ -1,9 +1,10 @@
 require ${PN}.inc
 
 PV = "0.13.0+gitr${SRCPV}"
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 SRCREV = "8a158bb1ea36d0f88da18d0f034884b30f09fda2"
-SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"
+SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \
+    file://revert-mncc-version.patch"
 
 S = "${WORKDIR}/git/openbsc"

From f71f5ea031d96a5a84bde4531974542ae49f8bee Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Wed, 23 Apr 2014 11:46:05 +0200
Subject: [PATCH 04/11] openbsc: Correct the OpenBSC MGCP GW configuration file

---
 recipes-osmocom/openbsc/openbsc.inc                | 2 +-
 recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc
index 06c0d97bff..7c27ecc5bf 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -11,7 +11,7 @@ SRC_URI = "file://osmo-nitb.init \
 	   file://osmo-bsc.init \
 	   file://osmo-sgsn.init"
 
-INC_PR = "r17.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r18.${META_TELEPHONY_OSMO_INC}"
 
 
 EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp"
diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init
index badd954f07..f41758880a 100755
--- a/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init
+++ b/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init
@@ -11,7 +11,7 @@
 DAEMON=/usr/bin/osmo-bsc_mgcp
 NAME=osmo-bsc_mgcp
 DESC="Osmocom GSM BSC MGCP proxy"
-NORMAL_ARGS="-D -c /etc/osmocom/bsc_mgcp.cfg"
+NORMAL_ARGS="-D -c /etc/osmocom/osmo-bsc-mgcp.cfg"
 
 OSMOBTS_EXTRA_ARGS=""
 NO_START=1

From ea7e6ec76396aa3fc99531de82d68e3ede59f2bf Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sun, 18 May 2014 11:06:04 +0200
Subject: [PATCH 05/11] add missing lcr-no_amr.diff from
 068f2d676a8fcdf37c67fc64d993cde85a6b78f4

---
 recipes-isdn/lcr/files/lcr-no_amr.diff | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 recipes-isdn/lcr/files/lcr-no_amr.diff

diff --git a/recipes-isdn/lcr/files/lcr-no_amr.diff b/recipes-isdn/lcr/files/lcr-no_amr.diff
new file mode 100644
index 0000000000..b5b85f0c50
--- /dev/null
+++ b/recipes-isdn/lcr/files/lcr-no_amr.diff
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index 1911187..c395ee2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -185,8 +185,8 @@ AM_CONDITIONAL(ENABLE_GSM_MS, test "x$with_gsm_ms" == "xyes" )
+ AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes")
+ 
+ # check for opencore-amrnb for AMR and EFR decoding
+-found_opencore_amrnb=yes
+-PKG_CHECK_MODULES(OPENCORE_AMRNB, opencore-amrnb >= 0.1.0, , found_opencore_amrnb=no)
++found_opencore_amrnb=no
++#PKG_CHECK_MODULES(OPENCORE_AMRNB, opencore-amrnb >= 0.1.0, , found_opencore_amrnb=no)
+ AM_CONDITIONAL(ENABLE_GSMAMR, test "$found_opencore_amrnb" = "yes")
+ if test "$found_opencore_amrnb" = yes; then
+ 	AC_DEFINE(HAVE_OPENCORE_AMRNB, 1, [Define to 1 if OpenCore AMR-NB library is available])

From eff76c2d8c5485d22057bb107d46eb7672646c70 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Mon, 19 May 2014 11:32:16 +0200
Subject: [PATCH 06/11] lcr: update to current master; re-introduce AMR support

Update to current master of lcr, which includes support for AMR
and RTP-bridge.  Master openbsc doesn't support RTP-bridge yet,
but it will work with a transcoding LCR getting all TCH frames
in all codecs (HR/FR/EFR/AMR) via MNCC.
---
 recipes-isdn/lcr/files/lcr-no_amr.diff | 15 ---------------
 recipes-isdn/lcr/lcr_git.bb            |  5 ++---
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 recipes-isdn/lcr/files/lcr-no_amr.diff

diff --git a/recipes-isdn/lcr/files/lcr-no_amr.diff b/recipes-isdn/lcr/files/lcr-no_amr.diff
deleted file mode 100644
index b5b85f0c50..0000000000
--- a/recipes-isdn/lcr/files/lcr-no_amr.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1911187..c395ee2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -185,8 +185,8 @@ AM_CONDITIONAL(ENABLE_GSM_MS, test "x$with_gsm_ms" == "xyes" )
- AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes")
- 
- # check for opencore-amrnb for AMR and EFR decoding
--found_opencore_amrnb=yes
--PKG_CHECK_MODULES(OPENCORE_AMRNB, opencore-amrnb >= 0.1.0, , found_opencore_amrnb=no)
-+found_opencore_amrnb=no
-+#PKG_CHECK_MODULES(OPENCORE_AMRNB, opencore-amrnb >= 0.1.0, , found_opencore_amrnb=no)
- AM_CONDITIONAL(ENABLE_GSMAMR, test "$found_opencore_amrnb" = "yes")
- if test "$found_opencore_amrnb" = yes; then
- 	AC_DEFINE(HAVE_OPENCORE_AMRNB, 1, [Define to 1 if OpenCore AMR-NB library is available])
diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb
index 7e90a19116..ab0837563e 100644
--- a/recipes-isdn/lcr/lcr_git.bb
+++ b/recipes-isdn/lcr/lcr_git.bb
@@ -4,13 +4,12 @@ HOMEPAGE = "http://isdn.eversberg.eu/"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996"
 
-PV = "1.13+gitr${SRCPV}"
+PV = "1.14+gitr${SRCPV}"
 PR = "r2"
 
-SRCREV = "f3b94bf3a9599359805eaf20f3b036272c7af522"
+SRCREV = "38fce218f8897d120aeba56e811ef7dada898c2c"
 SRC_URI = "git://git.misdn.eu/lcr.git \
 	   file://lcr-disable-gsmfr.diff \
-	   file://lcr-no_amr.diff \
            file://lcr.init             "
 S = "${WORKDIR}/git"
 

From ba7830e7e195031326ed32471ac323455238cd34 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Mon, 19 May 2014 11:43:07 +0200
Subject: [PATCH 07/11] openbsc: update to current master for MNCC-AMR and
 TCH/H support

---
 .../openbsc/openbsc/upgrade-mncc-version.patch  | 17 +++++++++++++++++
 recipes-osmocom/openbsc/openbsc_git.bb          |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 recipes-osmocom/openbsc/openbsc/upgrade-mncc-version.patch

diff --git a/recipes-osmocom/openbsc/openbsc/upgrade-mncc-version.patch b/recipes-osmocom/openbsc/openbsc/upgrade-mncc-version.patch
new file mode 100644
index 0000000000..b856cc3ce3
--- /dev/null
+++ b/recipes-osmocom/openbsc/openbsc/upgrade-mncc-version.patch
@@ -0,0 +1,17 @@
+lcr uses MNCC_SOCK_VERSION 5, but this is binary compatible to
+what openbsc thinks is version 4.  The only difference is the added
+RTP related commands, which are optional.
+
+Index: openbsc/include/openbsc/mncc.h
+===================================================================
+--- openbsc.orig/include/openbsc/mncc.h
++++ openbsc/include/openbsc/mncc.h
+@@ -163,7 +163,7 @@ struct gsm_data_frame {
+ 	unsigned char	data[0];
+ };
+ 
+-#define MNCC_SOCK_VERSION	4
++#define MNCC_SOCK_VERSION	5
+ struct gsm_mncc_hello {
+ 	uint32_t	msg_type;
+ 	uint32_t	version;
diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb
index 7d395ca382..7fe8988642 100644
--- a/recipes-osmocom/openbsc/openbsc_git.bb
+++ b/recipes-osmocom/openbsc/openbsc_git.bb
@@ -3,8 +3,8 @@ require ${PN}.inc
 PV = "0.13.0+gitr${SRCPV}"
 PR = "${INC_PR}.4"
 
-SRCREV = "8a158bb1ea36d0f88da18d0f034884b30f09fda2"
+SRCREV = "a4c63b0cdba82a453875d9208d9dad0b9b530d56"
 SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \
-    file://revert-mncc-version.patch"
+    file://upgrade-mncc-version.patch"
 
 S = "${WORKDIR}/git/openbsc"

From 26199eb66bd2fdb8bcdd7a79f6c9a5f31fd08f47 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Thu, 22 May 2014 18:03:32 +0200
Subject: [PATCH 08/11] libosmo-netif: Add new recipe for the osmux library

---
 recipes-osmocom/libosmo-netif/libosmo-netif.inc    | 10 ++++++++++
 recipes-osmocom/libosmo-netif/libosmo-netif_git.bb |  7 +++++++
 2 files changed, 17 insertions(+)
 create mode 100644 recipes-osmocom/libosmo-netif/libosmo-netif.inc
 create mode 100644 recipes-osmocom/libosmo-netif/libosmo-netif_git.bb

diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif.inc b/recipes-osmocom/libosmo-netif/libosmo-netif.inc
new file mode 100644
index 0000000000..4284a6afb7
--- /dev/null
+++ b/recipes-osmocom/libosmo-netif/libosmo-netif.inc
@@ -0,0 +1,10 @@
+DESCRITOPN = "Osmux utility classes"
+DEPENDS = "libosmo-abis"
+HOMEPAGE = "http://git.osmocom.org"
+LICENSE = "GPLv2+"
+
+INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+inherit autotools_stage pkgconfig
diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
new file mode 100644
index 0000000000..691425a3ce
--- /dev/null
+++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+S = "${WORKDIR}/git"
+SRCREV = "153f5856607b75ca76c540288cd6b4df144290ff"
+SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git"
+PV = "0.3.0+gitr${SRCPV}"
+PR = "${INC_PR}.2"

From e673cd68aec1cc6dc6ade6704bc7021cc864b933 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Mon, 9 Jun 2014 19:29:13 +0200
Subject: [PATCH 09/11] openbsc: Add osmo-sgsn to the INITSCRIPT_PACKAGES

osmo-sgsn was installing a sysvinit script but it wasn't inside
the INITSCRIPT_PACKAGES so it would not be started by default.
Use the already existing INITSCRIPT_PARAMS/INITSCRIPT_NAME variables
for the osmo-sgsn.

Fixes: SYS#366
---
 recipes-osmocom/openbsc/openbsc.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc
index 7c27ecc5bf..558dfa2e21 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -11,7 +11,7 @@ SRC_URI = "file://osmo-nitb.init \
 	   file://osmo-bsc.init \
 	   file://osmo-sgsn.init"
 
-INC_PR = "r18.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r19.${META_TELEPHONY_OSMO_INC}"
 
 
 EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp"
@@ -49,7 +49,7 @@ do_install_append() {
 
 PACKAGES =+ "osmo-bsc osmo-nitb osmo-gbproxy osmo-gbproxy-dbg osmo-sgsn ipaccess-utils osmo-bsc-mgcp osmo-bsc-nat"
 
-INITSCRIPT_PACKAGES = "osmo-bsc osmo-bsc-mgcp osmo-nitb"
+INITSCRIPT_PACKAGES = "osmo-bsc osmo-bsc-mgcp osmo-nitb osmo-sgsn"
 
 CONFFILES_osmo-bsc = "${sysconfdir}/osmocom/osmo-bsc.cfg"
 INITSCRIPT_NAME_osmo-bsc = "osmo-bsc"

From 723ace723605667edaa95bd30c63d494d9eb7f86 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Mon, 16 Jun 2014 17:52:06 +0200
Subject: [PATCH 10/11] bcg729: Add the BCG729, a transcoding library used by
 linphone

---
 recipes-misc/bcg729/bcg729_git.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 recipes-misc/bcg729/bcg729_git.bb

diff --git a/recipes-misc/bcg729/bcg729_git.bb b/recipes-misc/bcg729/bcg729_git.bb
new file mode 100644
index 0000000000..2be5942ac1
--- /dev/null
+++ b/recipes-misc/bcg729/bcg729_git.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "G729 codec library"
+HOMEPAGE = "http://www.linphone.org/eng/documentation/dev/bcg729.html"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SRC_URI = "git://git.linphone.org/bcg729.git"
+SRCREV = "2e36a5d4bc6e992c654eee6b0a8db729da7b1d31"
+PV = "0+gitr${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+inherit autotools

From 023ca5da04c53ef93ce7c933c2d362ad901ad45e Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Mon, 16 Jun 2014 18:16:02 +0200
Subject: [PATCH 11/11] openbsc: Build newer version of OpenBSC and enable
 transcoding

* Build MGCP with osmux support
* Merged the MGCP transcoding patches
* Fix double RF Channel Release handling
---
 recipes-osmocom/openbsc/openbsc.inc    | 6 +++---
 recipes-osmocom/openbsc/openbsc_git.bb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc
index 558dfa2e21..830429cae2 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "OpenBSC a Free Software GSM BaseStationController"
-DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis openggsn libsmpp34"
+DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif openggsn libsmpp34 bcg729 libgsm"
 HOMEPAGE = "http://openbsc.osmocom.org/"
 LICENSE = "AGPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
@@ -11,10 +11,10 @@ SRC_URI = "file://osmo-nitb.init \
 	   file://osmo-bsc.init \
 	   file://osmo-sgsn.init"
 
-INC_PR = "r19.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r20.${META_TELEPHONY_OSMO_INC}"
 
 
-EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp"
+EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729"
 
 inherit autotools update-rc.d
 
diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb
index 7fe8988642..d515bf8cb5 100644
--- a/recipes-osmocom/openbsc/openbsc_git.bb
+++ b/recipes-osmocom/openbsc/openbsc_git.bb
@@ -3,7 +3,7 @@ require ${PN}.inc
 PV = "0.13.0+gitr${SRCPV}"
 PR = "${INC_PR}.4"
 
-SRCREV = "a4c63b0cdba82a453875d9208d9dad0b9b530d56"
+SRCREV = "421365eeaa104a9781214f9e12c55023c1099bf8"
 SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \
     file://upgrade-mncc-version.patch"