Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chan-sccp: update to latest commit

Browse source 
- Update to latest commit to get support for Asterisk 15
- Upstream renamed the project from chan-sccp-b to chan-sccp. This
  commit updates the OpenWrt Makefile accordingly.
- Move the directory from chan-sccp-b to asterisk-chan-sccp (follow the
  naming of the other channel drivers' directories).
- OpenWrt Asterisk13 is mistaken for Asterisk15 because it has the
  iostream patch applied, fix this with workaround in autoconf script.
- Update upstream URL to the github page.
- Update description of the package.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-11-23 18:01:02 +01:00
parent 0f39076796
commit 8fc851f0d5
7 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
net/chan-sccp-b/Makefile → net/asterisk-chan-sccp/Makefile
View file

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=chan-sccp-b PKG_NAME:=chan-sccp
PKG_VERSION:=v4.3.0-20170814 PKG_VERSION:=v4.3.0-20171123
PKG_RELEASE:=1 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/chan-sccp/chan-sccp.git PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=016fee3a96b09d5404757f7b178af2e349e55bcc PKG_SOURCE_VERSION:=ed272e974897f075573a358d169e5c77889f5905
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
@ -38,29 +38,30 @@ TARGET_LDFLAGS+= \
-L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv -L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv
endif endif
define Package/chan-sccp-b/Default define Package/chan-sccp/Default
SUBMENU:=Telephony SUBMENU:=Telephony
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=SCCP channel provider support TITLE:=SCCP channel support
URL:=http://chan-sccp-b.sourceforge.net/ URL:=https://github.com/chan-sccp/chan-sccp
DEPENDS:=+USE_UCLIBC:libiconv-full +libltdl DEPENDS:=+USE_UCLIBC:libiconv-full +libltdl
PKG_BUILD_DEPENDS:=libiconv PKG_BUILD_DEPENDS:=libiconv
endef endef
define Package/asterisk13-chan-sccp-b define Package/asterisk13-chan-sccp
$(call Package/chan-sccp-b/Default) $(call Package/chan-sccp/Default)
DEPENDS+= asterisk13 DEPENDS+= asterisk13
VARIANT:=asterisk13 VARIANT:=asterisk13
CONFLICTS:=asterisk13-chan-skinny CONFLICTS:=asterisk13-chan-skinny
endef endef
define Package/description/Default define Package/description/Default
SCCP channel provider for asterisk. It delivers extended functionality for SCCP phones over chan_skinny delivered Replacement for the SCCP channel driver (chan_skinny) in Asterisk.
by asterisk by default. Extended features include shared lines, presence / BLF, customizable
feature buttons and custom device state.
endef endef
Package/asterisk13-chan-sccp-b/description = $(Package/description/Default) Package/asterisk13-chan-sccp/description = $(Package/description/Default)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-debug \ --disable-debug \
@ -80,7 +81,15 @@ define Package/conffiles/Default
/etc/asterisk/sccp.conf.realtime_sample /etc/asterisk/sccp.conf.realtime_sample
endef endef
Package/asterisk13-chan-sccp-b/conffiles = $(Package/conffiles/Default) Package/asterisk13-chan-sccp/conffiles = $(Package/conffiles/Default)
define Build/Prepare
$(call Build/Prepare/Default)
ifeq ($(BUILD_VARIANT),asterisk13)
$(SED) 's|asterisk/iostream.h|asterisk/iostream.404|' \
$(PKG_BUILD_DIR)/autoconf/asterisk.m4
endif
endef
define Package/Install/Default define Package/Install/Default
$(INSTALL_DIR) $(1)/etc/asterisk $(INSTALL_DIR) $(1)/etc/asterisk
@ -93,6 +102,6 @@ define Package/Install/Default
$(INSTALL_DATA) ./files/sccp.conf.realtime_sample $(1)/etc/asterisk/sccp.conf.realtime_sample $(INSTALL_DATA) ./files/sccp.conf.realtime_sample $(1)/etc/asterisk/sccp.conf.realtime_sample
endef endef
Package/asterisk13-chan-sccp-b/install = $(Package/Install/Default) Package/asterisk13-chan-sccp/install = $(Package/Install/Default)
$(eval $(call BuildPackage,asterisk13-chan-sccp-b)) $(eval $(call BuildPackage,asterisk13-chan-sccp))

0
net/chan-sccp-b/files/extconfig.conf.sccp_sample → net/asterisk-chan-sccp/files/extconfig.conf.sccp_sample
View file

0
net/chan-sccp-b/files/res_config_sqlite3.conf.sccp_sample → net/asterisk-chan-sccp/files/res_config_sqlite3.conf.sccp_sample
View file

0
net/chan-sccp-b/files/sccp.conf → net/asterisk-chan-sccp/files/sccp.conf
View file

0
net/chan-sccp-b/files/sccp.conf.realtime_sample → net/asterisk-chan-sccp/files/sccp.conf.realtime_sample
View file

0
net/chan-sccp-b/files/sccp_sqlite3.sql → net/asterisk-chan-sccp/files/sccp_sqlite3.sql
View file

6
net/chan-sccp-b/patches/01-prevent-extra-optimization.patch → net/asterisk-chan-sccp/patches/01-prevent-extra-optimization.patch
View file

@ -1,9 +1,9 @@
--- a/autoconf/extra.m4 --- a/autoconf/extra.m4
+++ b/autoconf/extra.m4 +++ b/autoconf/extra.m4
@@ -472,17 +472,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [ @@ -491,17 +491,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
], SUPPORTED_CFLAGS)
]) ])
CPPFLAGS_saved="${CPPFLAGS_saved} -D_FORTIFY_SOURCE=2" AC_SUBST([strip_binaries])
GDB_FLAGS=""
- ], [ - ], [
- CFLAGS_saved="`echo ${CFLAGS_saved} |sed -e 's/\-O[0-9]\ \?//g' -e 's/[^|\ ]\-g[$|\ ]//g'`" - CFLAGS_saved="`echo ${CFLAGS_saved} |sed -e 's/\-O[0-9]\ \?//g' -e 's/[^|\ ]\-g[$|\ ]//g'`"
- optimize_flag="-O0" - optimize_flag="-O0"