projects / feed / telephony.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
freeswitch-stable: cleanups
[feed/telephony.git] / net / freeswitch-stable / Makefile
diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile
index d882de213295f204b8169b9fe1cd3ca7ff746ccd..b5d03d2a2549601bfa1b51585a00b8339230d76d 100644 (file)
--- a/net/freeswitch-stable/Makefile
+++ b/net/freeswitch-stable/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PRG_NAME:=freeswitch
 PKG_NAME:=$(PRG_NAME)-stable
-PKG_VERSION:=1.6.18
+PKG_VERSION:=1.6.19
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 
 PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://files.$(PRG_NAME).org/releases/$(PRG_NAME)
-PKG_HASH:=ac1b32f61e5c35680c5a2d6f145bc480cf26e6527af07d8b8b9fa2d5280252cd
+PKG_HASH:=e8d271a0d876ba4cca551682af0a4f5047bfd79438fcebdcc17d00711c04a8ff
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PRG_NAME)-$(PKG_VERSION)
 
@@ -53,24 +53,24 @@ PKG_LICENSE:= \
 
 PKG_LICENSE_FILES:=debian/copyright
 
-FS_STABLE_PREFIX_DIR:=/usr/share/$(PRG_NAME)
+FS_STABLE_DATA_DIR:=/usr/share/$(PRG_NAME)
 
 FS_STABLE_BIN_DIR:=/usr/bin
-FS_STABLE_EXAMPLES_DIR:=$(FS_STABLE_PREFIX_DIR)/examples
-FS_STABLE_FONTS_DIR:=$(FS_STABLE_PREFIX_DIR)/fonts
-FS_STABLE_GRAMMAR_DIR:=$(FS_STABLE_PREFIX_DIR)/grammar
-FS_STABLE_HTDOCS_DIR:=$(FS_STABLE_PREFIX_DIR)/htdocs
-FS_STABLE_IMAGES_DIR:=$(FS_STABLE_PREFIX_DIR)/images
+FS_STABLE_EXAMPLES_DIR:=$(FS_STABLE_DATA_DIR)/examples
+FS_STABLE_FONTS_DIR:=$(FS_STABLE_DATA_DIR)/fonts
+FS_STABLE_GRAMMAR_DIR:=$(FS_STABLE_DATA_DIR)/grammar
+FS_STABLE_HTDOCS_DIR:=$(FS_STABLE_DATA_DIR)/htdocs
+FS_STABLE_IMAGES_DIR:=$(FS_STABLE_DATA_DIR)/images
 FS_STABLE_INCLUDES_DIR:=/usr/include/$(PRG_NAME)
-FS_STABLE_LANG_DIR:=$(FS_STABLE_PREFIX_DIR)/lang
+FS_STABLE_LANG_DIR:=$(FS_STABLE_DATA_DIR)/lang
 FS_STABLE_LIB_DIR:=/usr/lib
 FS_STABLE_MOD_DIR:=$(FS_STABLE_LIB_DIR)/$(PRG_NAME)/mod
 FS_STABLE_PKGCONFIG_DIR:=$(FS_STABLE_LIB_DIR)/pkgconfig
-FS_STABLE_SCRIPTS_DIR:=$(FS_STABLE_PREFIX_DIR)/scripts
-FS_STABLE_SOUNDS_DIR:=$(FS_STABLE_PREFIX_DIR)/sounds
+FS_STABLE_SCRIPTS_DIR:=$(FS_STABLE_DATA_DIR)/scripts
+FS_STABLE_SOUNDS_DIR:=$(FS_STABLE_DATA_DIR)/sounds
 FS_STABLE_SYSCONF_DIR:=/etc
 FS_STABLE_TLS_DIR:=$(FS_STABLE_SYSCONF_DIR)/$(PRG_NAME)/tls
-FS_STABLE_TZ_DIR:=$(FS_STABLE_PREFIX_DIR)/tz
+FS_STABLE_TZ_DIR:=$(FS_STABLE_DATA_DIR)/tz
 
 # Maintain a list of all non-module packages so they can be added to
 # PKG_CONFIG_DEPENDS.
@@ -253,6 +253,8 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_FS_STABLE_WITH_PGSQL \
        CONFIG_FS_STABLE_WITH_PNG \
        CONFIG_FS_STABLE_WITH_SRTP \
+       CONFIG_FS_STABLE_WITH_V8 \
+       CONFIG_FS_STABLE_WITH_V8_SNAPSHOT \
        CONFIG_FS_STABLE_WITH_VPX \
        CONFIG_FS_STABLE_WITH_ZRTP \
        CONFIG_LIBC \
@@ -262,8 +264,8 @@ include $(INCLUDE_DIR)/package.mk
 
 FS_STABLE_PERL_FEED:=$(TOPDIR)/feeds/packages/lang/perl
 
-include $(FS_STABLE_PERL_FEED)/perlmod.mk
 $(call include_mk, python-host.mk)
+include $(FS_STABLE_PERL_FEED)/perlmod.mk
 
 FS_STABLE_PERL_LIBS:=$(shell grep "^libs=" \
        $(FS_STABLE_PERL_FEED)/files/base.config | \
@@ -572,10 +574,10 @@ endif
 ifeq ($(1),perl)
        $(INSTALL_DIR) $$(1)$(PERL_SITELIB)/auto/$(PRG_NAME)
        $(INSTALL_BIN) \
-               $(PKG_INSTALL_DIR)$(FS_STABLE_PREFIX_DIR)/perl/$(PRG_NAME).so \
+               $(PKG_INSTALL_DIR)/usr/perl/$(PRG_NAME).so \
                                        $$(1)$(PERL_SITELIB)/auto/$(PRG_NAME)
        $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)$(FS_STABLE_PREFIX_DIR)/perl/$(PRG_NAME).pm \
+               $(PKG_INSTALL_DIR)/usr/perl/$(PRG_NAME).pm \
                                                        $$(1)$(PERL_SITELIB)
 endif
 ifeq ($(1),python)
@@ -628,33 +630,16 @@ $$(eval $$(call BuildPackage,$(PKG_NAME)-util-$(1)))
 endef
 
 CONFIGURE_ARGS+= \
-       --build=$(GNU_HOST_NAME) \
-       --host=$(GNU_TARGET_NAME) \
-       --target=$(GNU_TARGET_NAME) \
-       --prefix=$(FS_STABLE_PREFIX_DIR) \
-       --bindir=$(FS_STABLE_BIN_DIR) \
-       --includedir=$(FS_STABLE_INCLUDES_DIR) \
-       --libdir=$(FS_STABLE_LIB_DIR) \
        --srcdir=$(PKG_BUILD_DIR) \
-       --sysconfdir=$(FS_STABLE_SYSCONF_DIR) \
        --disable-dependency-tracking \
        --disable-static \
        --disable-system-xmlrpc-c \
        --enable-fhs \
        --with-cachedir=/tmp/$(PRG_NAME)/cache \
-       --with-certsdir=$(FS_STABLE_TLS_DIR) \
        --with-dbdir=/tmp/$(PRG_NAME)/db \
-       --with-fontsdir=$(FS_STABLE_FONTS_DIR) \
-       --with-grammardir=$(FS_STABLE_GRAMMAR_DIR) \
-       --with-htdocsdir=$(FS_STABLE_HTDOCS_DIR) \
        --with-imagesdir=$(FS_STABLE_IMAGES_DIR) \
        --with-logfiledir=/tmp/$(PRG_NAME)/log \
-       --with-modinstdir=$(FS_STABLE_MOD_DIR) \
-       --with-pkgconfigdir=$(FS_STABLE_PKGCONFIG_DIR) \
        --with-recordingsdir=/tmp/$(PRG_NAME)/recordings \
-       --with-rundir=/var/run/$(PRG_NAME) \
-       --with-scriptdir=$(FS_STABLE_SCRIPTS_DIR) \
-       --with-soundsdir=$(FS_STABLE_SOUNDS_DIR) \
        --with-storagedir=/tmp/$(PRG_NAME)/storage \
        $(call autoconf_bool,CONFIG_FS_STABLE_WITH_LIBEDIT,core-libedit-support) \
        $(call autoconf_bool,CONFIG_FS_STABLE_WITH_ODBC,core-odbc-support) \
@@ -684,7 +669,8 @@ endif
 
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-v8),)
 CONFIGURE_ARGS+= \
-       --enable-static-v8
+       --enable-static-v8 \
+       $(if $(CONFIG_FS_STABLE_WITH_V8_SNAPSHOT),,--disable-snapshot-v8)
 endif
 
 # Make mod_spandsp use fixed point math when soft float support is
@@ -1053,7 +1039,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,abstraction,API abstraction,This module
 $(eval $(call Package/$(PKG_NAME)/Module,alsa,ALSA endpoint,ALSA endpoint module.,+alsa-lib))
 $(eval $(call Package/$(PKG_NAME)/Module,amr,AMR passthrough,Passthrough AMR codec support.,))
 $(eval $(call Package/$(PKG_NAME)/Module,amrwb,AMR wideband passthrough,Passthrough AMR wideband codec support.,))
-$(eval $(call Package/$(PKG_NAME)/Module,av,AV,Video codec and format support via FFmpeg.,+libffmpeg-full @BROKEN)) # libffmpeg-full doesn't provide avresample
+$(eval $(call Package/$(PKG_NAME)/Module,av,AV,Video codec and format support via FFmpeg.,+libffmpeg-full @i386||x86_64))
 $(eval $(call Package/$(PKG_NAME)/Module,avmd,Voicemail detection,This module attempts to determine when a voicemail system has answered\nthe call.,))
 $(eval $(call Package/$(PKG_NAME)/Module,b64,Base64,Transfers data Base64 encoded.,))
 $(eval $(call Package/$(PKG_NAME)/Module,basic,BASIC,BASIC module for FreeSWITCH.,))
@@ -1119,7 +1105,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,odbc_cdr,ODBC CDR,ODBC Call Detail Reco
 $(eval $(call Package/$(PKG_NAME)/Module,opus,Opus,Opus codec support.,+libopus))
 $(eval $(call Package/$(PKG_NAME)/Module,oreka,Oreka,This module provides media recording with the Oreka cross-platform\naudio stream recording and retrieval system.,))
 $(eval $(call Package/$(PKG_NAME)/Module,perl,Perl,This package contains mod_perl for FreeSWITCH.,+libdb47 +libgdbm +perlbase-essential @PERL_THREADS))
-$(eval $(call Package/$(PKG_NAME)/Module,png,PNG,Allows playback of video using PNG files.,))
+$(eval $(call Package/$(PKG_NAME)/Module,png,PNG,Allows playback of video using PNG files.,@FS_STABLE_WITH_PNG))
 $(eval $(call Package/$(PKG_NAME)/Module,pocketsphinx,Pocketsphinx,This module allows speech recognition. You might want to install\n$(PKG_NAME)-misc-grammar as well.,+libsamplerate)) # When libsamplerate is found it'll be linked against, there is no switch to turn it off
 $(eval $(call Package/$(PKG_NAME)/Module,portaudio,Portaudio,Voice through a local soundcard.,+portaudio))
 $(eval $(call Package/$(PKG_NAME)/Module,portaudio_stream,Portaudio streaming,Stream from an external audio source for Music on Hold.,+portaudio))
Mirror of telephony feed