This patch updates asterisk-chan-sccp-b module to revision 5393. This update is required if asterisk18 gets updated to 1.8.27.0.
Signed-off-by: Jiri Slachta <slac...@cesnet.cz> --- net/asterisk-chan-sccp-b/Makefile | 24 +++++++++++++--------- .../patches/200-register-file-version.patch | 19 ----------------- net/asterisk-chan-sccp-b/patches/300-stdarg.patch | 10 --------- 3 files changed, 14 insertions(+), 39 deletions(-) delete mode 100644 net/asterisk-chan-sccp-b/patches/200-register-file-version.patch delete mode 100644 net/asterisk-chan-sccp-b/patches/300-stdarg.patch diff --git a/net/asterisk-chan-sccp-b/Makefile b/net/asterisk-chan-sccp-b/Makefile index 8201519..87406a0 100644 --- a/net/asterisk-chan-sccp-b/Makefile +++ b/net/asterisk-chan-sccp-b/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 OpenWrt.org +# Copyright (C) 2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,16 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk18-chan-sccp-b -PKG_REV=3004 -PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=2 +PKG_REV:=5393 +PKG_VERSION:=4.1r$(PKG_REV) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://svn.code.sf.net/p/chan-sccp-b/code/trunk +PKG_SOURCE_URL:=http://svn.code.sf.net/p/chan-sccp-b/code/branches/V4.1 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_PROTO:=svn +PKG_FIXUP:=autoreconf -fi + include $(INCLUDE_DIR)/package.mk define Package/asterisk18-chan-sccp-b @@ -26,7 +28,8 @@ define Package/asterisk18-chan-sccp-b CATEGORY:=Network TITLE:=SCCP channel provider for asterisk URL:=http://chan-sccp-b.sourceforge.net/ - DEPENDS:= asterisk18 +libltdl + DEPENDS:=asterisk18 +libltdl + MAINTAINER:=Jiri Slachta <slac...@cesnet.cz> endef define Package/asterisk18-chan-sccp-b/description @@ -34,12 +37,13 @@ define Package/asterisk18-chan-sccp-b/description by asterisk by default. endef -CONFIGURE_ARGS += \ - --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-1.8 +define Build/Configure + $(call Build/Configure/Default,--with-asterisk=$(STAGING_DIR)/usr/include/asterisk-1.8) +endef define Build/Compile $(MAKE) -C "$(PKG_BUILD_DIR)" \ - CFLAGS="$(CFLAGS) -DLOW_MEMORY" \ + CFLAGS="$(CFLAGS) -I$(PKG_BUILD_DIR)/src -DLOW_MEMORY" \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef @@ -50,7 +54,7 @@ endef define Package/asterisk18-chan-sccp-b/install $(INSTALL_DIR) $(1)/etc/asterisk - $(INSTALL_BIN) ./files/sccp.openwrt.conf $(1)/etc/asterisk/sccp.conf + $(CP) ./files/sccp.openwrt.conf $(1)/etc/asterisk/sccp.conf $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/ endef diff --git a/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch b/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch deleted file mode 100644 index 81ca9d3..0000000 --- a/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/chan_sccp.h -+++ b/src/chan_sccp.h -@@ -127,15 +127,7 @@ extern "C" { - # define CHECK_LEAKS() - # endif - --# define SCCP_FILE_VERSION(file, version) \ -- static void __attribute__((constructor)) __register_file_version(void) \ -- { \ -- pbx_register_file_version(file, version); \ -- } \ -- static void __attribute__((destructor)) __unregister_file_version(void) \ -- { \ -- pbx_unregister_file_version(file); \ -- } -+# define SCCP_FILE_VERSION(file, version) - - # define DEV_ID_LOG(x) x ? x->id : "SCCP" - diff --git a/net/asterisk-chan-sccp-b/patches/300-stdarg.patch b/net/asterisk-chan-sccp-b/patches/300-stdarg.patch deleted file mode 100644 index be91ed7..0000000 --- a/net/asterisk-chan-sccp-b/patches/300-stdarg.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/chan_sccp.h -+++ b/src/chan_sccp.h -@@ -32,6 +32,7 @@ extern "C" { - #include "common.h" - #include <poll.h> - #include "asterisk/compiler.h" -+#include <stdarg.h> - #include "asterisk/lock.h" - #include "asterisk/abstract_jb.h" - -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
