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] 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"