Merge pull request #295 from micmac1/dongle-up
authorJiri Slachta <jiri.slachta@gmail.com>
Tue, 13 Mar 2018 07:42:32 +0000 (08:42 +0100)
committerGitHub <noreply@github.com>
Tue, 13 Mar 2018 07:42:32 +0000 (08:42 +0100)
asterisk-chan-dongle: simplify and update snapshot

13 files changed:
libs/gsmlib/Makefile
libs/libctb/Makefile
libs/pjproject/Makefile
net/asterisk-13.x/Makefile
net/asterisk-15.x/Makefile
net/asterisk-chan-lantiq/Makefile
net/asterisk-chan-sccp/Makefile
net/freeswitch-stable/Makefile
net/kamailio-5.x/Makefile
net/pcapsipdump/Makefile
net/siproxd/Makefile
net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch [deleted file]
net/yate/Makefile

index 4184c21276e81594197ef992e57909b1e12d04b2..a67e4d1d2dd8fe71ebe8dbba798dcc0ab4608d29 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gsmlib
 PKG_VERSION:=1.10-20140304
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/vbouchaud/gsmlib.git
@@ -31,6 +31,7 @@ PKG_LICENSE:=LGPL-2.1+
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)/Default
@@ -43,7 +44,7 @@ $(call Package/$(PKG_NAME)/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=GSM mobile phone access lib
-  DEPENDS:=+libstdcpp
+  DEPENDS:=$(CXX_DEPENDS)
 endef
 
 define Package/gsm-utils
index 9c24fa19169d46df2af1a39b0c981e4b8664c49c..e2cb6b22d14579adff41cf06c0bb0c66d860e2c2 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libctb
 PKG_VERSION:=0.16
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://iftools.com/download/ctb/$(PKG_VERSION)
@@ -23,6 +23,7 @@ PKG_LICENSE:=LGPL
 PKG_LICENSE_FILES:=build/COPYING
 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -31,7 +32,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Libraries
   TITLE:=Communications toolbox - ctb
   URL:=https://iftools.com/opensource/ctb.en.php
-  DEPENDS:=+libstdcpp
+  DEPENDS:=$(CXX_DEPENDS)
 endef
 
 define Package/$(PKG_NAME)/description
index e089d15bafc6cb7a56b5d5c9877b1b0ae1203eae..bdf7efcc6bd038f8d0a9ed51602cc51a6f94c633 100644 (file)
@@ -25,6 +25,8 @@ PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_CONFIG_DEPENDS:=CONFIG_SOFT_FLOAT
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/pjproject/Default
index 7f4bbbd7e2093e02bdf9d566c0d2c1002ce5ee70..ff6e05f33f0a63281b7dff588ba62e25f6a1213b 100644 (file)
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk13
 PKG_VERSION:=13.19.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
@@ -39,8 +39,280 @@ MENUSELECT_CATEGORIES:= \
        MENUSELECT_UTILS \
        MENUSELECT_AGIS
 
+MODULES_AVAILABLE:= \
+       app-adsiprog \
+       app-agent-pool \
+       app-alarmreceiver \
+       app-amd \
+       app-authenticate \
+       app-bridgewait \
+       app-celgenuserevent \
+       app-chanisavail \
+       app-channelredirect \
+       app-chanspy \
+       app-confbridge \
+       app-controlplayback \
+       app-dahdiras \
+       app-dictate \
+       app-directed_pickup \
+       app-directory \
+       app-disa \
+       app-dumpchan \
+       app-exec \
+       app-externalivr \
+       app-festival \
+       app-flash \
+       app-followme \
+       app-getcpeid \
+       app-ices \
+       app-image \
+       app-ivrdemo \
+       app-milliwatt \
+       app-minivm \
+       app-mixmonitor \
+       app-morsecode \
+       app-mp3 \
+       app-originate \
+       app-page \
+       app-playtones \
+       app-privacy \
+       app-queue \
+       app-read \
+       app-readexten \
+       app-record \
+       app-saycounted \
+       app-sayunixtime \
+       app-senddtmf \
+       app-sendtext \
+       app-skel \
+       app-sms \
+       app-softhangup \
+       app-speech \
+       app-stack \
+       app-stasis \
+       app-system \
+       app-talkdetect \
+       app-test \
+       app-transfer \
+       app-url \
+       app-userevent \
+       app-verbose \
+       app-waitforring \
+       app-waitforsilence \
+       app-waituntil \
+       app-while \
+       app-zapateller \
+       bridge-builtin-features \
+       bridge-builtin-interval-features \
+       bridge-holding \
+       bridge-native-rtp \
+       bridge-simple \
+       bridge-softmix \
+       cdr \
+       cdr-csv \
+       cdr-sqlite3 \
+       cel-custom \
+       cel-manager \
+       cel-sqlite3-custom \
+       chan-alsa \
+       chan-bridge-media \
+       chan-console \
+       chan-dahdi \
+       chan-iax2 \
+       chan-mgcp \
+       chan-mobile \
+       chan-motif \
+       chan-ooh323 \
+       chan-oss \
+       chan-phone \
+       chan-rtp \
+       chan-sip \
+       chan-skinny \
+       chan-unistim \
+       codec-a-mu \
+       codec-adpcm \
+       codec-alaw \
+       codec-dahdi \
+       codec-g722 \
+       codec-g726 \
+       codec-gsm \
+       codec-ilbc \
+       codec-lpc10 \
+       codec-resample \
+       codec-speex \
+       codec-ulaw \
+       curl \
+       format-g719 \
+       format-g723 \
+       format-g726 \
+       format-g729 \
+       format-gsm \
+       format-h263 \
+       format-h264 \
+       format-ilbc \
+       format-jpeg \
+       format-mp3 \
+       format-ogg-vorbis \
+       format-pcm \
+       format-siren14 \
+       format-siren7 \
+       format-sln \
+       format-vox \
+       format-wav \
+       format-wav-gsm \
+       func-aes \
+       func-base64 \
+       func-blacklist \
+       func-callcompletion \
+       func-channel \
+       func-config \
+       func-cut \
+       func-db \
+       func-devstate \
+       func-dialgroup \
+       func-dialplan \
+       func-enum \
+       func-env \
+       func-extstate \
+       func-frame-trace \
+       func-global \
+       func-groupcount \
+       func-hangupcause \
+       func-holdintercept \
+       func-iconv \
+       func-jitterbuffer \
+       func-lock \
+       func-math \
+       func-md5 \
+       func-module \
+       func-periodic-hook \
+       func-pitchshift \
+       func-presencestate \
+       func-rand \
+       func-realtime \
+       func-sha1 \
+       func-shell \
+       func-sorcery \
+       func-speex \
+       func-sprintf \
+       func-srv \
+       func-sysinfo \
+       func-talkdetect \
+       func-uri \
+       func-version \
+       func-vmcount \
+       func-volume \
+       odbc \
+       pbx-ael \
+       pbx-dundi \
+       pbx-loopback \
+       pbx-lua \
+       pbx-realtime \
+       pbx-spool \
+       pgsql \
+       pjsip \
+       res-adsi \
+       res-ael-share \
+       res-agi \
+       res-ari \
+       res-ari-applications \
+       res-ari-asterisk \
+       res-ari-bridges \
+       res-ari-channels \
+       res-ari-device-states \
+       res-ari-endpoints \
+       res-ari-events \
+       res-ari-mailboxes \
+       res-ari-model \
+       res-ari-playbacks \
+       res-ari-recordings \
+       res-ari-sounds \
+       res-calendar \
+       res-calendar-caldav \
+       res-calendar-ews \
+       res-calendar-exchange \
+       res-calendar-icalendar \
+       res-chan-stats \
+       res-clialiases \
+       res-clioriginate \
+       res-config-ldap \
+       res-config-mysql \
+       res-config-sqlite3 \
+       res-convert \
+       res-endpoint-stats \
+       res-hep \
+       res-hep-pjsip \
+       res-hep-rtcp \
+       res-fax-spandsp \
+       res-fax \
+       res-format-attr-celt \
+       res-format-attr-g729 \
+       res-format-attr-h263 \
+       res-format-attr-h264 \
+       res-format-attr-opus \
+       res-format-attr-silk \
+       res-format-attr-siren14 \
+       res-format-attr-siren7 \
+       res-format-attr-vp8 \
+       res-http-websocket \
+       res-limit \
+       res-manager-devicestate \
+       res-manager-presencestate \
+       res-monitor \
+       res-musiconhold \
+       res-mutestream \
+       res-mwi-external \
+       res-mwi-external-ami \
+       res-parking \
+       res-phoneprov \
+       res-pjsip-phoneprov \
+       res-pjproject \
+       res-pktccops \
+       res-realtime \
+       res-rtp-asterisk \
+       res-rtp-multicast \
+       res-security-log \
+       res-smdi \
+       res-snmp \
+       res-sorcery \
+       res-sorcery-memory-cache \
+       res-speech \
+       res-srtp \
+       res-stasis \
+       res-stasis-answer \
+       res-stasis-device-state \
+       res-stasis-mailbox \
+       res-stasis-playback \
+       res-stasis-recording \
+       res-stasis-snoop \
+       res-statsd \
+       res-stun-monitor \
+       res-timing-dahdi \
+       res-timing-pthread \
+       res-timing-timerfd \
+       res-xmpp \
+       voicemail
+
+UTILS_AVAILABLE:= \
+       aelparse \
+       astcanary \
+       astdb2sqlite3 \
+       astdb2bdb \
+       check_expr \
+       check_expr2 \
+       conf2ael \
+       muted \
+       smsq \
+       stereorize \
+       streamplayer
+
 AST_ENABLE:=
 
+PKG_CONFIG_DEPENDS:= \
+       $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-%,$(MODULES_AVAILABLE)) \
+       $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-util-%,$(UTILS_AVAILABLE)) \
+       CONFIG_ASTERISK13_LOW_MEMORY
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -372,6 +644,13 @@ AST_MENUSELECT_OPTS = \
        --without-curses \
        --with-libxml2="$(STAGING_DIR_HOSTPKG)/usr"
 
+define Build/menuselect
+       CC="$(HOSTCC)" \
+       CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
+       LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
+       $(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
+endef
+
 define Build/Configure
        cd $(PKG_BUILD_DIR); \
                ./bootstrap.sh
@@ -389,11 +668,9 @@ define Build/Configure
 endef
 
 define Build/Compile
-       CC="$(HOSTCC)" \
-       CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
-       LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
-       $(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
-       $(MAKE) -C "$(PKG_BUILD_DIR)" menuselect-tree
+       $(call Build/menuselect)
+       $(call Build/Compile/Default,menuselect-tree)
+
        cd "$(PKG_BUILD_DIR)" && MENUSELECT_ARGS= && \
                for cat in $(MENUSELECT_CATEGORIES); do \
                        MENUSELECT_ARGS="$$$$MENUSELECT_ARGS --disable-category $$$$cat"; \
@@ -413,13 +690,15 @@ define Build/Compile
                        --disable BUILD_NATIVE \
                        $(if $(CONFIG_ASTERISK13_LOW_MEMORY),--enable LOW_MEMORY) \
                        menuselect.makeopts
-       # Hack:
+
        # When changing anything in MENUSELECT_CFLAGS the file ".lastclean"
        # gets deleted. E.g. when compiling on x86 for x86 "--disable
        # BUILD_NATIVE" changes MENUSELECT_CFLAGS and the file gets removed.
        # But that will result in a rebuild attempt of menuselect which will
-       # likely fail. Prevent that by recreating ".lastclean".
-       $(CP) "$(PKG_BUILD_DIR)/.cleancount" "$(PKG_BUILD_DIR)/.lastclean"
+       # likely fail. Prevent that by recreating ".lastclean" and menuselect.
+       $(call Build/Compile/Default,.lastclean)
+       $(call Build/menuselect)
+
        $(call Build/Compile/Default,all install samples)
 endef
 
@@ -709,13 +988,13 @@ $(eval $(call BuildAsterisk13Module,voicemail,Voicemail,voicemail related module
 ################################
 # $(eval $(call BuildAsterisk13Util,Utility,Description,Dependencies,Configuration Files))
 
-$(eval $(call BuildAsterisk13Util,aelparse,Check extensions.ael file.,,))
+$(eval $(call BuildAsterisk13Util,aelparse,Check extensions.ael file.,+$(PKG_NAME)-pbx-ael,))
 $(eval $(call BuildAsterisk13Util,astcanary,Assures Asterisk no threads have gone missing.,,))
 $(eval $(call BuildAsterisk13Util,astdb2sqlite3,Convert astdb to SQLite 3.,,))
 $(eval $(call BuildAsterisk13Util,astdb2bdb,Convert astdb back to Berkeley DB 1.86.,,))
 $(eval $(call BuildAsterisk13Util,check_expr,Expression checker [older version].,,))
 $(eval $(call BuildAsterisk13Util,check_expr2,Expression checker [newer version].,,))
-$(eval $(call BuildAsterisk13Util,conf2ael,Convert .conf to .ael.,,))
+$(eval $(call BuildAsterisk13Util,conf2ael,Convert .conf to .ael.,+$(PKG_NAME)-pbx-ael,))
 $(eval $(call BuildAsterisk13Util,muted,Listens for AMI events. Mutes soundcard during call.,,muted.conf))
 $(eval $(call BuildAsterisk13Util,smsq,Send messages from command line.,,))
 $(eval $(call BuildAsterisk13Util,stereorize,Merge two mono WAV-files to one stereo WAV-file.,,))
index 088b7cd4df2237489e2cb8e139a36f69216147c3..66aa265b9a35f927485ed09b5fa232b6f01df275 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk15
 PKG_VERSION:=15.2.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
@@ -37,8 +37,288 @@ MENUSELECT_CATEGORIES:= \
        MENUSELECT_UTILS \
        MENUSELECT_AGIS
 
+MODULES_AVAILABLE:= \
+       app-adsiprog \
+       app-agent-pool \
+       app-alarmreceiver \
+       app-amd \
+       app-authenticate \
+       app-bridgeaddchan \
+       app-bridgewait \
+       app-celgenuserevent \
+       app-chanisavail \
+       app-channelredirect \
+       app-chanspy \
+       app-confbridge \
+       app-controlplayback \
+       app-dahdiras \
+       app-dictate \
+       app-directed_pickup \
+       app-directory \
+       app-disa \
+       app-dumpchan \
+       app-exec \
+       app-externalivr \
+       app-festival \
+       app-flash \
+       app-followme \
+       app-getcpeid \
+       app-ices \
+       app-image \
+       app-ivrdemo \
+       app-milliwatt \
+       app-minivm \
+       app-mixmonitor \
+       app-morsecode \
+       app-mp3 \
+       app-originate \
+       app-page \
+       app-playtones \
+       app-privacy \
+       app-queue \
+       app-read \
+       app-readexten \
+       app-record \
+       app-saycounted \
+       app-sayunixtime \
+       app-senddtmf \
+       app-sendtext \
+       app-skel \
+       app-sms \
+       app-softhangup \
+       app-speech \
+       app-stack \
+       app-stasis \
+       app-statsd \
+       app-stream-echo \
+       app-system \
+       app-talkdetect \
+       app-test \
+       app-transfer \
+       app-url \
+       app-userevent \
+       app-verbose \
+       app-waitforring \
+       app-waitforsilence \
+       app-waituntil \
+       app-while \
+       app-zapateller \
+       bridge-builtin-features \
+       bridge-builtin-interval-features \
+       bridge-holding \
+       bridge-native-rtp \
+       bridge-simple \
+       bridge-softmix \
+       cdr \
+       cdr-csv \
+       cdr-sqlite3 \
+       cel-custom \
+       cel-manager \
+       cel-sqlite3-custom \
+       chan-alsa \
+       chan-bridge-media \
+       chan-console \
+       chan-dahdi \
+       chan-iax2 \
+       chan-mgcp \
+       chan-mobile \
+       chan-motif \
+       chan-ooh323 \
+       chan-oss \
+       chan-phone \
+       chan-rtp \
+       chan-sip \
+       chan-skinny \
+       chan-unistim \
+       codec-a-mu \
+       codec-adpcm \
+       codec-alaw \
+       codec-dahdi \
+       codec-g722 \
+       codec-g726 \
+       codec-gsm \
+       codec-ilbc \
+       codec-lpc10 \
+       codec-resample \
+       codec-speex \
+       codec-ulaw \
+       curl \
+       format-g719 \
+       format-g723 \
+       format-g726 \
+       format-g729 \
+       format-gsm \
+       format-h263 \
+       format-h264 \
+       format-ilbc \
+       format-jpeg \
+       format-mp3 \
+       format-ogg-speex \
+       format-ogg-vorbis \
+       format-pcm \
+       format-siren14 \
+       format-siren7 \
+       format-sln \
+       format-vox \
+       format-wav \
+       format-wav-gsm \
+       func-aes \
+       func-base64 \
+       func-blacklist \
+       func-callcompletion \
+       func-channel \
+       func-config \
+       func-cut \
+       func-db \
+       func-devstate \
+       func-dialgroup \
+       func-dialplan \
+       func-enum \
+       func-env \
+       func-extstate \
+       func-frame-trace \
+       func-global \
+       func-groupcount \
+       func-hangupcause \
+       func-holdintercept \
+       func-iconv \
+       func-jitterbuffer \
+       func-lock \
+       func-math \
+       func-md5 \
+       func-module \
+       func-periodic-hook \
+       func-pitchshift \
+       func-presencestate \
+       func-rand \
+       func-realtime \
+       func-sha1 \
+       func-shell \
+       func-sorcery \
+       func-speex \
+       func-sprintf \
+       func-srv \
+       func-sysinfo \
+       func-talkdetect \
+       func-uri \
+       func-version \
+       func-vmcount \
+       func-volume \
+       odbc \
+       pbx-ael \
+       pbx-dundi \
+       pbx-loopback \
+       pbx-lua \
+       pbx-realtime \
+       pbx-spool \
+       pgsql \
+       pjsip \
+       res-adsi \
+       res-ael-share \
+       res-agi \
+       res-ari \
+       res-ari-applications \
+       res-ari-asterisk \
+       res-ari-bridges \
+       res-ari-channels \
+       res-ari-device-states \
+       res-ari-endpoints \
+       res-ari-events \
+       res-ari-mailboxes \
+       res-ari-model \
+       res-ari-playbacks \
+       res-ari-recordings \
+       res-ari-sounds \
+       res-calendar \
+       res-calendar-caldav \
+       res-calendar-ews \
+       res-calendar-exchange \
+       res-calendar-icalendar \
+       res-chan-stats \
+       res-clialiases \
+       res-clioriginate \
+       res-config-ldap \
+       res-config-mysql \
+       res-config-sqlite3 \
+       res-convert \
+       res-endpoint-stats \
+       res-hep \
+       res-hep-pjsip \
+       res-hep-rtcp \
+       res-fax-spandsp \
+       res-fax \
+       res-format-attr-celt \
+       res-format-attr-g729 \
+       res-format-attr-h263 \
+       res-format-attr-h264 \
+       res-format-attr-ilbc \
+       res-format-attr-opus \
+       res-format-attr-silk \
+       res-format-attr-siren14 \
+       res-format-attr-siren7 \
+       res-format-attr-vp8 \
+       res-http-media-cache \
+       res-http-websocket \
+       res-limit \
+       res-manager-devicestate \
+       res-manager-presencestate \
+       res-monitor \
+       res-musiconhold \
+       res-mutestream \
+       res-mwi-external \
+       res-mwi-external-ami \
+       res-parking \
+       res-phoneprov \
+       res-pjsip-phoneprov \
+       res-pjproject \
+       res-pktccops \
+       res-realtime \
+       res-resolver-unbound \
+       res-rtp-asterisk \
+       res-rtp-multicast \
+       res-sdp-translator-pjmedia \
+       res-security-log \
+       res-smdi \
+       res-snmp \
+       res-sorcery \
+       res-sorcery-memory-cache \
+       res-speech \
+       res-srtp \
+       res-stasis \
+       res-stasis-answer \
+       res-stasis-device-state \
+       res-stasis-mailbox \
+       res-stasis-playback \
+       res-stasis-recording \
+       res-stasis-snoop \
+       res-statsd \
+       res-stun-monitor \
+       res-timing-dahdi \
+       res-timing-pthread \
+       res-timing-timerfd \
+       res-xmpp \
+       voicemail
+
+UTILS_AVAILABLE:= \
+       aelparse \
+       astcanary \
+       astdb2sqlite3 \
+       astdb2bdb \
+       check_expr \
+       check_expr2 \
+       conf2ael \
+       muted \
+       smsq \
+       stereorize \
+       streamplayer
+
 AST_ENABLE:=
 
+PKG_CONFIG_DEPENDS:= \
+       $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-%,$(MODULES_AVAILABLE)) \
+       $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-util-%,$(UTILS_AVAILABLE)) \
+       CONFIG_ASTERISK15_LOW_MEMORY
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -379,6 +659,13 @@ AST_MENUSELECT_OPTS = \
        --without-curses \
        --with-libxml2="$(STAGING_DIR_HOSTPKG)/usr"
 
+define Build/menuselect
+       CC="$(HOSTCC)" \
+       CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
+       LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
+       $(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
+endef
+
 define Build/Configure
        cd $(PKG_BUILD_DIR); \
                ./bootstrap.sh
@@ -396,11 +683,9 @@ define Build/Configure
 endef
 
 define Build/Compile
-       CC="$(HOSTCC)" \
-       CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
-       LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
-       $(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
-       $(MAKE) -C "$(PKG_BUILD_DIR)" menuselect-tree
+       $(call Build/menuselect)
+       $(call Build/Compile/Default,menuselect-tree)
+
        cd "$(PKG_BUILD_DIR)" && MENUSELECT_ARGS= && \
                for cat in $(MENUSELECT_CATEGORIES); do \
                        MENUSELECT_ARGS="$$$$MENUSELECT_ARGS --disable-category $$$$cat"; \
@@ -420,13 +705,15 @@ define Build/Compile
                        --disable BUILD_NATIVE \
                        $(if $(CONFIG_ASTERISK15_LOW_MEMORY),--enable LOW_MEMORY) \
                        menuselect.makeopts
-       # Hack:
+
        # When changing anything in MENUSELECT_CFLAGS the file ".lastclean"
        # gets deleted. E.g. when compiling on x86 for x86 "--disable
        # BUILD_NATIVE" changes MENUSELECT_CFLAGS and the file gets removed.
        # But that will result in a rebuild attempt of menuselect which will
-       # likely fail. Prevent that by recreating ".lastclean".
-       $(CP) "$(PKG_BUILD_DIR)/.cleancount" "$(PKG_BUILD_DIR)/.lastclean"
+       # likely fail. Prevent that by recreating ".lastclean" and menuselect.
+       $(call Build/Compile/Default,.lastclean)
+       $(call Build/menuselect)
+
        $(call Build/Compile/Default,all install samples)
 endef
 
@@ -724,13 +1011,13 @@ $(eval $(call BuildAsterisk15Module,voicemail,Voicemail,voicemail related module
 ################################
 # $(eval $(call BuildAsterisk15Util,Utility,Description,Dependencies,Configuration Files))
 
-$(eval $(call BuildAsterisk15Util,aelparse,Check extensions.ael file.,,))
+$(eval $(call BuildAsterisk15Util,aelparse,Check extensions.ael file.,+$(PKG_NAME)-pbx-ael,))
 $(eval $(call BuildAsterisk15Util,astcanary,Assures Asterisk no threads have gone missing.,,))
 $(eval $(call BuildAsterisk15Util,astdb2sqlite3,Convert astdb to SQLite 3.,,))
 $(eval $(call BuildAsterisk15Util,astdb2bdb,Convert astdb back to Berkeley DB 1.86.,,))
 $(eval $(call BuildAsterisk15Util,check_expr,Expression checker [older version].,,))
 $(eval $(call BuildAsterisk15Util,check_expr2,Expression checker [newer version].,,))
-$(eval $(call BuildAsterisk15Util,conf2ael,Convert .conf to .ael.,,))
+$(eval $(call BuildAsterisk15Util,conf2ael,Convert .conf to .ael.,+$(PKG_NAME)-pbx-ael,))
 $(eval $(call BuildAsterisk15Util,muted,Listens for AMI events. Mutes soundcard during call.,,muted.conf))
 $(eval $(call BuildAsterisk15Util,smsq,Send messages from command line.,,))
 $(eval $(call BuildAsterisk15Util,stereorize,Merge two mono WAV-files to one stereo WAV-file.,,))
index 0c3d364d78e35f6f632db8925aac6d21803a2f5b..c8d0b75aafd22addc34879c43accf1077f479e62 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017 OpenWrt.org
+# Copyright (C) 2017 - 2018 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,17 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chan-lantiq
-PKG_VERSION:=20171128
+PKG_VERSION:=20180215
 PKG_RELEASE:=1
 
-LANTIQ_AST13_VERSION:=5adf3d7774a75c88835f2f3daf824e2cda2c6e67
-LANTIQ_AST15_VERSION:=2eb991b66d135e6f22da30a2827918aed2d7b328
+LANTIQ_AST13_VERSION:=f0d7ca7df8e5df802c5bcb79643e3bdc3956c190
+LANTIQ_AST15_VERSION:=c9d68dd06fcd46ac7985df45f8c2b8833e658f8e
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_FLAGS:=nonshared
+
 include $(INCLUDE_DIR)/package.mk
 
 define Download/github
@@ -38,7 +40,7 @@ define Package/$(PKG_NAME)/Default
   CATEGORY:=Network
   TITLE:=Lantiq channel driver
   URL:=https://github.com/kochstefan/asterisk_channel_lantiq
-  DEPENDS:=kmod-ltq-vmmc
+  DEPENDS:=+kmod-ltq-vmmc
 endef
 
 define Package/asterisk13-$(PKG_NAME)
index 7771cceefab293e87a5244ce8614714f7593b7a2..d91a9b782cad85b25a7cb7a2695fa2c3127ba666 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 - 2017 OpenWrt.org
+# Copyright (C) 2016 - 2018 OpenWrt.org
 # Copyright (C) 2016 Cesnet, z.s.p.o.
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9,14 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chan-sccp
-PKG_VERSION:=v4.3.0-20171123
-PKG_RELEASE:=3
+PKG_VERSION:=v4.3.0-20180308
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ed272e974897f075573a358d169e5c77889f5905
-PKG_MIRROR_HASH:=b2fa296e532154b864164a9bc8d64a40dddef2940902b61c3726c77f56b4e74e
+PKG_SOURCE_VERSION:=7764d2f2b65e62329ceff501b06a2eb2db68dafb
+PKG_MIRROR_HASH:=39047994c85b4bb7e8e85d9c93b3a3a5517576b594f9898970e93d741f850e37
 PKG_SOURCE_PROTO:=git
 
 PKG_FIXUP:=autoreconf
@@ -93,17 +93,6 @@ endef
 Package/asterisk13-chan-sccp/conffiles = $(Package/conffiles/Default)
 Package/asterisk15-chan-sccp/conffiles = $(Package/conffiles/Default)
 
-# Asterisk 13 gets mistaken for Asterisk 15 because it was patched to include
-# iostream support. To get it detected correctly make it impossible for the
-# build system to find the iostream header.
-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
        $(INSTALL_DIR) $(1)/etc/asterisk
        $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/asterisk/sccp.conf $(1)/etc/asterisk
index 9124ca8d7a42bac77e96d3f87a70cacace13fe7c..17728b48e4562991adaffa7d349de8c8fd4d3333 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PRG_NAME:=freeswitch
 PKG_NAME:=$(PRG_NAME)-stable
 PKG_VERSION:=1.6.20
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 
 PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz
@@ -237,6 +237,7 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_$(PKG_NAME)-misc-python-esl \
        CONFIG_SOFT_FLOAT
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 FS_STABLE_PERL_FEED:=$(TOPDIR)/feeds/packages/lang/perl
@@ -359,6 +360,7 @@ $(call Package/$(PKG_NAME)/Default)
   MENU:=1
   USERID:=$(PRG_NAME)=372:$(PRG_NAME)=372
   DEPENDS:= \
+         $(CXX_DEPENDS) \
          +FS_STABLE_WITH_FREETYPE:libfreetype \
          +FS_STABLE_WITH_ODBC:unixodbc \
          +FS_STABLE_WITH_PGSQL:libpq \
@@ -373,7 +375,6 @@ $(call Package/$(PKG_NAME)/Default)
          +libspeex \
          +libspeexdsp \
          +libsqlite3 \
-         +libstdcpp \
          +libuuid \
          +zlib
   CONFLICTS:=$(PRG_NAME)
@@ -1141,7 +1142,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,esl,Single ESL,This module adds an API
 $(eval $(call Package/$(PKG_NAME)/Module,event_multicast,Multicast Event,Multicast Event System for FreeSWITCH.,))
 $(eval $(call Package/$(PKG_NAME)/Module,event_socket,Event socket,Sends events via a single socket. Needed for fs_cli.,))
 $(eval $(call Package/$(PKG_NAME)/Module,event_test,Event test,Event demo module.,))
-$(eval $(call Package/$(PKG_NAME)/Module,event_zmq,ZMQ event,ZMQ event module.,))
+$(eval $(call Package/$(PKG_NAME)/Module,event_zmq,ZMQ event,ZMQ event module.,@!USE_UCLIBCXX))
 $(eval $(call Package/$(PKG_NAME)/Module,expr,Expr,This module adds expr support for expression evaluation.,))
 $(eval $(call Package/$(PKG_NAME)/Module,fifo,FIFO,This module adds a first-in first-out queue system.,))
 $(eval $(call Package/$(PKG_NAME)/Module,format_cdr,Multiformat CDR,A superset of mod_json_cdr and mod_xml_cdr.,))
@@ -1225,7 +1226,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,tone_stream,Tone stream,Tone generation
 $(eval $(call Package/$(PKG_NAME)/Module,translate,Number translation,This module implements number translation.,))
 $(eval $(call Package/$(PKG_NAME)/Module,tts_commandline,TTS command-line,Run a command-line and play the output file.,))
 $(eval $(call Package/$(PKG_NAME)/Module,unimrcp,UniMRCP,Allows communication with Media Resource Control Protocol servers.,))
-$(eval $(call Package/$(PKG_NAME)/Module,v8,V8,This package contains mod_v8 for FreeSWITCH.,@FS_STABLE_WITH_V8 @arm||i386||mipsel||x86_64))
+$(eval $(call Package/$(PKG_NAME)/Module,v8,V8,This package contains mod_v8 for FreeSWITCH.,@!USE_UCLIBCXX @FS_STABLE_WITH_V8 @arm||i386||mipsel||x86_64))
 $(eval $(call Package/$(PKG_NAME)/Module,valet_parking,Valet parking,This module implements the valet call parking strategy.,))
 $(eval $(call Package/$(PKG_NAME)/Module,verto,Verto,Verto signaling protocol.,))
 $(eval $(call Package/$(PKG_NAME)/Module,vmd,Voicemail detection,This module detects voicemail beeps.,))
index f4481a73a9643613dff52e6b269b6349c25f03e0..2e7bc6abf253c43318469b66543fda2e01dea757 100644 (file)
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio5
-PKG_VERSION:=5.1.1
-PKG_RELEASE:=3
+PKG_VERSION:=5.1.2
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
-PKG_HASH:=96f15fd639d6ea2f4f9921e83ecddff0ac42732f2709bcf7269d591952676fc4
+PKG_HASH:=6ec9cefa1fa0b7e2090e41f34172db511dafa27c0c11e2b8c2140bc875b16b5d
 PKG_USE_MIPS16:=0
 
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
+MODULES_AVAILABLE:= \
+       acc \
+       acc_diameter \
+       alias_db \
+       app_jsdt \
+       app_lua \
+       app_python \
+       app_sqlang \
+       async \
+       auth \
+       auth_db \
+       auth_diameter \
+       auth_ephemeral \
+       auth_identity \
+       auth_xkeys \
+       avp \
+       avpops \
+       benchmark \
+       blst \
+       call_control \
+       call_obj \
+       carrierroute \
+       cdp \
+       cdp_avp \
+       cfgutils \
+       cfg_db \
+       cfg_rpc \
+       cfgt \
+       cnxcc \
+       corex \
+       counters \
+       cplc \
+       crypto \
+       ctl \
+       db2_ldap \
+       db2_ops \
+       db_berkeley \
+       db_cluster \
+       db_flatstore \
+       db_mysql \
+       db_postgres \
+       db_sqlite \
+       db_text \
+       db_unixodbc \
+       debugger \
+       dialog \
+       dialplan \
+       dispatcher \
+       diversion \
+       dmq \
+       dmq_usrloc \
+       domain \
+       domainpolicy \
+       drouting \
+       enum \
+       erlang \
+       evapi \
+       evrexec \
+       exec \
+       group \
+       gzcompress \
+       h350 \
+       htable \
+       http_client \
+       imc \
+       ims_auth \
+       ims_charging \
+       ims_dialog \
+       ims_diameter_server \
+       ims_icscf \
+       ims_isc \
+       ims_ocs \
+       ims_qos \
+       ims_registrar_pcscf \
+       ims_registrar_scscf \
+       ims_usrloc_pcscf \
+       ims_usrloc_scscf \
+       ipops \
+       jansson \
+       janssonrpcc \
+       json \
+       jsonrpcs \
+       keepalive \
+       kex \
+       lcr \
+       ldap \
+       log_custom \
+       mangler \
+       matrix \
+       maxfwd \
+       mediaproxy \
+       mohqueue \
+       mqueue \
+       msilo \
+       msrp \
+       mtree \
+       nathelper \
+       nat_traversal \
+       ndb_redis \
+       nosip \
+       outbound \
+       p_usrloc \
+       path \
+       pdb \
+       pdt \
+       permissions \
+       pike \
+       pipelimit \
+       prefix_route \
+       presence \
+       presence_conference \
+       presence_dialoginfo \
+       presence_mwi \
+       presence_profile \
+       presence_reginfo \
+       presence_xml \
+       pua \
+       pua_bla \
+       pua_dialoginfo \
+       pua_reginfo \
+       pua_rpc \
+       pua_usrloc \
+       pua_xmpp \
+       pv \
+       qos \
+       ratelimit \
+       regex \
+       registrar \
+       rls \
+       rr \
+       rtimer \
+       rtjson \
+       rtpengine \
+       rtpproxy \
+       sanity \
+       sca \
+       sctp \
+       sdpops \
+       seas \
+       sipcapture \
+       sipdump \
+       sipt \
+       siptrace \
+       siputils \
+       sl \
+       sms \
+       smsops \
+       snmpstats \
+       speeddial \
+       sqlops \
+       ss7ops \
+       statistics \
+       statsc \
+       statsd \
+       stun \
+       sst \
+       tcpops \
+       textops \
+       textopsx \
+       timer \
+       tls \
+       tmrec \
+       topoh \
+       topos \
+       topos_redis \
+       tm \
+       tmx \
+       tsilo \
+       uac \
+       uac_redirect \
+       uid_auth_db \
+       uid_avp_db \
+       uid_domain \
+       uid_gflags \
+       uid_uri_db \
+       uri_db \
+       userblacklist \
+       usrloc \
+       utils \
+       uuid \
+       websocket \
+       xcap_client \
+       xcap_server \
+       xhttp \
+       xhttp_pi \
+       xhttp_rpc \
+       xlog \
+       xmlops \
+       xmlrpc \
+       xmpp \
+       xprint
+
+PKG_CONFIG_DEPENDS:= \
+       $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-mod-%,$(subst _,-,$(MODULES_AVAILABLE)))
+
 include $(INCLUDE_DIR)/nls.mk
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/python/python-host.mk
index d259b176895c0c180d6bba742e05de7ab99ddab0..ebc3a9bd54d0ed9bbef06f65acc1debc1fb4a6ef 100644 (file)
@@ -36,9 +36,10 @@ define Package/pcapsipdump/description
  (even if there is thousands of concurrect SIP sessions).
 endef
 
-MAKE_VARS += \
+MAKE_FLAGS += \
        CC="$(TARGET_CXX)" \
-       CPPFLAGS="$(TARGET_CXXFLAGS) -fno-rtti $(TARGET_CPPFLAGS)"
+       CPPFLAGS="$(TARGET_CXXFLAGS) -fno-rtti $(TARGET_CPPFLAGS)" \
+       LIBS="-lpcap"
 
 define Package/pcapsipdump/install
        $(INSTALL_DIR) $(1)/usr/bin
index 5b9ad8fcb1d0c26ed5d19c3be4458ec096bb5e1d..489e36f844a8f7f2fbb164181711a797ad2838ad 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2017 OpenWrt.org
+# Copyright (C) 2014-2018 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=siproxd
 PKG_VERSION:=0.8.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/siproxd
@@ -48,11 +48,11 @@ endef
 
 CONFIGURE_ARGS+= \
        --with-libosip-prefix="$(STAGING_DIR)/usr" \
+       --disable-ltdl-convenience \
        --disable-doc
 
 MAKE_FLAGS+= \
-       SUBDIRS="src scripts contrib" \
-       LIBLTDL="$(STAGING_DIR)/usr/lib/libltdl.la" \
+       SUBDIRS="src scripts contrib"
 
 define Package/siproxd/install
        $(INSTALL_DIR) $(1)/usr/sbin
@@ -72,7 +72,7 @@ define BuildPlugin
 
   define Package/siproxd-mod-$(1)/install
        $(INSTALL_DIR) $$(1)/usr/lib/siproxd
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/siproxd/plugin_$(1)*.so* $$(1)/usr/lib/siproxd
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/siproxd/plugin_$(1).so $$(1)/usr/lib/siproxd
   endef
 
   $$(eval $$(call BuildPackage,siproxd-mod-$(1)))
diff --git a/net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch b/net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch
deleted file mode 100644 (file)
index d457eb4..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -103,8 +103,8 @@
- #  else Cygwin goes beserk when building...)
- #
- sbin_PROGRAMS = siproxd
--siproxd_LDFLAGS=-export-dynamic
--siproxd_LDADD = $(LIBLTDL) $(DLOPENPLUGINS)
-+siproxd_LDFLAGS=-export-dynamic -lltdl
-+siproxd_LDADD = $(DLOPENPLUGINS)
- siproxd_SOURCES = siproxd.c proxy.c register.c sock.c utils.c \
-                 sip_utils.c sip_layer.c log.c readconf.c rtpproxy.c \
-                 rtpproxy_relay.c accessctl.c route_processing.c \
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -377,8 +377,8 @@
- #
- plugin_fix_fbox_anoncall_la_SOURCES = plugin_fix_fbox_anoncall.c
- plugin_fix_fbox_anoncall_la_LDFLAGS = -module -avoid-version -shrext '.so'
--siproxd_LDFLAGS = -export-dynamic
--siproxd_LDADD = $(LIBLTDL) $(DLOPENPLUGINS)
-+siproxd_LDFLAGS = -export-dynamic -lltdl
-+siproxd_LDADD = $(DLOPENPLUGINS)
- siproxd_SOURCES = siproxd.c proxy.c register.c sock.c utils.c \
-                 sip_utils.c sip_layer.c log.c readconf.c rtpproxy.c \
-                 rtpproxy_relay.c accessctl.c route_processing.c \
index 94310dc589509015310713f1ba3de6bbb43874c3..1abb810d232293d253ec4ee30e48706e56683d03 100644 (file)
@@ -28,6 +28,17 @@ PKG_INSTALL:=1
 # Yate currently does not compile with FORTIFY_SOURCE enabled
 PKG_FORTIFY_SOURCE:=0
 
+PKG_CONFIG_DEPENDS:= \
+       CONFIG_PACKAGE_$(PKG_NAME)-mod-zapcard \
+       CONFIG_PACKAGE_$(PKG_NAME)-mod-ilbcwebrtc \
+       CONFIG_PACKAGE_$(PKG_NAME)-mod-isaccodec \
+       CONFIG_PACKAGE_$(PKG_NAME)-mod-pgsqldb \
+       CONFIG_PACKAGE_$(PKG_NAME)-mod-mysqld \
+       CONFIG_PACKAGE_$(PKG_NAME)-mod-faxchan \
+       CONFIG_PACKAGE_$(PKG_NAME)-mod-openssl \
+       CONFIG_PACKAGE_$(PKG_NAME)-mod-zlibcompress \
+       CONFIG_SOFT_FLOAT
+
 include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk