From 068f2d676a8fcdf37c67fc64d993cde85a6b78f4 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 4 Dec 2013 16:28:31 +0100 Subject: [PATCH] lcr: disable AMR support for now, to force GSM FR to be used. --- recipes-isdn/lcr/files/lcr-disable-gsmfr.diff | 14 +++++++++++--- recipes-isdn/lcr/lcr_git.bb | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/recipes-isdn/lcr/files/lcr-disable-gsmfr.diff b/recipes-isdn/lcr/files/lcr-disable-gsmfr.diff index ff968af312..1c94c6569a 100644 --- a/recipes-isdn/lcr/files/lcr-disable-gsmfr.diff +++ b/recipes-isdn/lcr/files/lcr-disable-gsmfr.diff @@ -1,8 +1,16 @@ diff --git a/Makefile.am b/Makefile.am -index b1fab38..053f26e 100644 +index b1fab38..df19a20 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -61,15 +61,8 @@ GSM_LIB = +@@ -53,23 +53,14 @@ MISDN_LIB = -lmisdn + + endif + +-SUBDIRS = +- + GSM_INCLUDE = + GSM_SOURCE = + GSM_LIB = if ENABLE_GSM @@ -19,7 +27,7 @@ index b1fab38..053f26e 100644 if ENABLE_GSMHR -@@ -205,14 +198,6 @@ TONEDIRS = tones_american tones_efi tones_german vbox_english vbox_german +@@ -205,14 +196,6 @@ TONEDIRS = tones_american tones_efi tones_german vbox_english vbox_german EXTRA_DIST = default debian $(TONEDIRS) install-data-hook: diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index 4dbcd95c47..7e90a19116 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -5,11 +5,12 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996" PV = "1.13+gitr${SRCPV}" -PR = "r1" +PR = "r2" SRCREV = "f3b94bf3a9599359805eaf20f3b036272c7af522" SRC_URI = "git://git.misdn.eu/lcr.git \ file://lcr-disable-gsmfr.diff \ + file://lcr-no_amr.diff \ file://lcr.init " S = "${WORKDIR}/git"