update lcr to 1.13 + current git

recipes-isdn/lcr/files/lcr-disable-gsmfr.diff

@@ -0,0 +1,36 @@
+diff --git a/Makefile.am b/Makefile.am
+index b1fab38..053f26e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -61,15 +61,8 @@ GSM_LIB =
+ 
+ if ENABLE_GSM
+ 
+-#if ENABLE_GSMFR
+-
+ GSM_INCLUDE += -DWITH_GSMFR
+-
+-GSM_LIB += libgsmfr/lib/libgsm.a
+-
+-SUBDIRS += libgsmfr
+-
+-#endif
++GSM_LIB += -lgsm
+ 
+ if ENABLE_GSMHR
+ 
+@@ -205,14 +198,6 @@ TONEDIRS = tones_american tones_efi tones_german vbox_english vbox_german
+ EXTRA_DIST = default debian $(TONEDIRS)
+ 
+ install-data-hook:
+-	@fns='strcpy strncpy strcat strncat sprintf snprintf' ; \
+-	files=$$( find $(srcdir) -type f -name "*.c*" \
+-	  | $(GREP) -v -e chan_lcr.c -e callerid.c ) ; \
+-	test -z "$$files" || { for fn in $$fns ; do \
+-	  $(GREP) -n $$fn $$files ; if test $$? = 0 ; then \
+-	    ( echo "dont use $$fn, use makro instead." ; exit -1 ) ; \
+-	  fi ; \
+-	done ; }
+ 	mkdir -p '$(DESTDIR)$(CONFIGdir)'
+ 	mkdir -p '$(DESTDIR)$(SHAREdir)'
+ 	mkdir -p '$(DESTDIR)$(LOGdir)'

recipes-isdn/lcr/lcr_git.bb

@@ -1,43 +1,43 @@
 DESCRITOPN = "Linux Call Router"
-DEPENDS = "misdn-utils asterisk libgsm"
+DEPENDS = "asterisk libgsm libopencore-amr sofia-sip"
 HOMEPAGE = "http://isdn.eversberg.eu/"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996"
 
-PV = "1.10+gitr${SRCPV}"
-PR = "r16"
+PV = "1.13+gitr${SRCPV}"
+PR = "r1"
 
-SRCREV = "cd2834a10ceb14f8d2e70334a89b531119b954d4"
+SRCREV = "f3b94bf3a9599359805eaf20f3b036272c7af522"
 SRC_URI = "git://git.misdn.eu/lcr.git \
+	   file://lcr-disable-gsmfr.diff \
            file://lcr.init             "
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF = "--with-gsm-bs --with-asterisk"
-
-RDEPENDS_${PN} += "kernel-module-misdn-l1loop kernel-module-misdn-dsp"
+EXTRA_OECONF = "--with-gsm-bs --with-asterisk --without-misdn --with-sip"
 
 inherit autotools update-rc.d
 
 PACKAGES =+ "${PN}-tones-de ${PN}-vbox-de \
-             ${PN}-tones-en ${PN}-vbox-en "
+             ${PN}-tones-en ${PN}-vbox-en \
+	     ${PN}-asterisk"
 
-FILES_${PN} += "/usr/local ${libdir}/asterisk/modules"
-FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug"
-CONFFILES_${PN} = "/usr/local/lcr/options.conf"
+CONFFILES_${PN} = "${sysconfdir}/lcr/options.conf"
 INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME_${PN} = "lcr"
 INITSCRIPT_PARAMS_${PN} = "defaults 30 30"
 
-FILES_${PN}-tones-de = "/usr/local/lcr/tones_german"
-FILES_${PN}-tones-en = "/usr/local/lcr/tones_american"
-FILES_${PN}-vbox-de = "/usr/local/lcr/vbox_german"
-FILES_${PN}-vbox-en = "/usr/local/lcr/vbox_english"
+FILES_${PN}-tones-de = "/usr/share/lcr/tones_german"
+FILES_${PN}-tones-en = "/usr/share/lcr/tones_american"
+FILES_${PN}-vbox-de = "/usr/share/lcr/vbox_german"
+FILES_${PN}-vbox-en = "/usr/share/lcr/vbox_english"
+FILES_${PN}-asterisk = "/usr/lib/asterisk/modules/chan_lcr.so"
 
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0775 ${WORKDIR}/lcr.init ${D}${sysconfdir}/init.d/lcr
 
-	rm ${D}/usr/local/lcr/routing.conf
-	rm ${D}/usr/local/lcr/interface.conf
+	rm ${D}${sysconfdir}/lcr/routing.conf
+	rm ${D}${sysconfdir}/lcr/interface.conf
+	rm ${D}${sysconfdir}/lcr/directory.list
 }