lcr: Upgrade to post 1.10 and build from my personal branch

Update to 1.10 to work with newer osmo-nitb, including the version
handshake that was introduced.
This commit is contained in:
Holger Hans Peter Freyther 2012-01-16 16:11:55 +08:00
parent e77df798a7
commit 8f3955af20
2 changed files with 5 additions and 50 deletions

View File

@ -1,44 +0,0 @@
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am 2011-10-14 00:53:48.245117239 +0800
+++ git/Makefile.am 2011-10-14 00:53:48.633117240 +0800
@@ -53,7 +53,7 @@
GSM_SOURCE += gsm_audio.c gsm.cpp
-GSM_LIB += /usr/lib/libgsm.a
+GSM_LIB += -lgsm
#gsm_audio.po: gsm_audio.c gsm_audio.h
# $(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po
Index: git/configure.ac
===================================================================
--- git.orig/configure.ac 2011-10-14 00:53:48.257117239 +0800
+++ git/configure.ac 2011-10-14 00:53:48.633117240 +0800
@@ -178,12 +178,7 @@
AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes")
AS_IF([test "x$with_gsm_bs" == xyes -o "x$with_gsm_ms" == xyes],
- [AC_MSG_CHECKING(/usr/include/gsm/gsm.h)
- if test -e /usr/include/gsm/gsm.h; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_FAILURE([You have enabled GSM, but /usr/include/gsm/gsm.h not found! Please install the lossy GSM codec. Be sure to install it in /usr/ and not in /usr/local/. You will also find a copy on http://www.linux-call-router.de.])
- fi
+ AC_MSG_RESULT(yes...why not use ac_check_headers...)
])
# check for ss5
Index: git/gsm_audio.c
===================================================================
--- git.orig/gsm_audio.c 2011-10-14 00:53:48.000000000 +0800
+++ git/gsm_audio.c 2011-10-14 00:55:12.929117386 +0800
@@ -10,7 +10,7 @@
\*****************************************************************************/
extern "C" {
-#include "/usr/include/gsm/gsm.h"
+#include <gsm/gsm.h>
/* create gsm instance */

View File

@ -4,13 +4,12 @@ HOMEPAGE = "http://isdn.eversberg.eu/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996"
PV = "1.10"
PR = "r10"
PV = "1.10+gitr${SRCPV}"
PR = "r14"
SRCREV = "27ade6eeb9859a0702e77b27ca0abed63d298cda"
SRC_URI = "git://git.misdn.org/lcr.git \
file://lcr.init \
file://gsm-diff.patch"
SRCREV = "cd2834a10ceb14f8d2e70334a89b531119b954d4"
SRC_URI = "git://git.misdn.eu/lcr.git \
file://lcr.init "
S = "${WORKDIR}/git"
EXTRA_OECONF = "--with-gsm-bs --with-asterisk"