asterisk-16.x-chan-lantiq: bump for DTMF fix
Patch and exports file dropped as included upstream. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
parent
abc7a17142
commit
87182ea560
3 changed files with 4 additions and 61 deletions
|
@ -8,14 +8,14 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=asterisk16-chan-lantiq
|
PKG_NAME:=asterisk16-chan-lantiq
|
||||||
PKG_VERSION:=20180215
|
PKG_VERSION:=20210911
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
|
PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
|
||||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||||
PKG_SOURCE_VERSION:=c9d68dd06fcd46ac7985df45f8c2b8833e658f8e
|
PKG_SOURCE_VERSION:=2f029ec8778420538c8151c6aceba0f7b44b07c9
|
||||||
PKG_MIRROR_HASH:=8666c18b24adf9da3ddf12306fcf0a8b4f56860c256b172bd0ba5c2a7a3ab25e
|
PKG_MIRROR_HASH:=72ce3cb4a081c6ea39c9814fba03997ef32b48e927469508222f5641fe987c65
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
@ -43,12 +43,6 @@ define Package/$(PKG_NAME)/conffiles
|
||||||
/etc/asterisk/lantiq.conf
|
/etc/asterisk/lantiq.conf
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Prepare
|
|
||||||
$(call Build/Prepare/Default)
|
|
||||||
$(INSTALL_DATA) ./files/default.exports \
|
|
||||||
$(PKG_BUILD_DIR)/src/channels/chan_lantiq.exports
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
cd $(PKG_BUILD_DIR)/src/channels && \
|
cd $(PKG_BUILD_DIR)/src/channels && \
|
||||||
$(TARGET_CC) -o chan_lantiq.o -c chan_lantiq.c -MD -MT chan_lantiq.o \
|
$(TARGET_CC) -o chan_lantiq.o -c chan_lantiq.c -MD -MT chan_lantiq.o \
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
{
|
|
||||||
global:
|
|
||||||
/* See main/asterisk.exports.in for an explanation why this is
|
|
||||||
* needed. */
|
|
||||||
_IO_stdin_used;
|
|
||||||
local:
|
|
||||||
*;
|
|
||||||
};
|
|
|
@ -1,43 +0,0 @@
|
||||||
commit 30f9a094c1c60e0d68e4ea189f48ecb47aebb485
|
|
||||||
Author: arny <arnysch@gmx.net>
|
|
||||||
Date: Thu May 2 20:07:28 2019 +0200
|
|
||||||
|
|
||||||
Use ast_malloc and ast_free instead of malloc and free
|
|
||||||
in order to get rid of build errors with asterisk16 in OpenWrt
|
|
||||||
|
|
||||||
Signed-off-by: arny <arnysch@gmx.net>
|
|
||||||
|
|
||||||
diff --git a/src/channels/chan_lantiq.c b/src/channels/chan_lantiq.c
|
|
||||||
index a8fc869..90002ab 100644
|
|
||||||
--- a/src/channels/chan_lantiq.c
|
|
||||||
+++ b/src/channels/chan_lantiq.c
|
|
||||||
@@ -563,9 +563,9 @@ lantiq_dev_binary_buffer_create(const char *path, uint8_t **ppBuf, uint32_t *pBu
|
|
||||||
goto on_exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
- *ppBuf = malloc(file_stat.st_size);
|
|
||||||
+ *ppBuf = ast_malloc(file_stat.st_size);
|
|
||||||
if (*ppBuf == NULL) {
|
|
||||||
- ast_log(LOG_ERROR, "binary file %s memory allocation failed\n", path);
|
|
||||||
+ // Message already logged by ast_malloc
|
|
||||||
goto on_exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -583,7 +583,7 @@ on_exit:
|
|
||||||
fclose(fd);
|
|
||||||
|
|
||||||
if (*ppBuf != NULL && status)
|
|
||||||
- free(*ppBuf);
|
|
||||||
+ ast_free(*ppBuf);
|
|
||||||
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
@@ -609,7 +609,7 @@ static int32_t lantiq_dev_firmware_download(int32_t fd, const char *path)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (firmware != NULL)
|
|
||||||
- free(firmware);
|
|
||||||
+ ast_free(firmware);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
Loading…
Reference in a new issue