From 2cba38dbaf89e55e40bec6325d9a34cddc0e2cf6 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 18 Aug 2019 11:58:13 +0200 Subject: [PATCH 1/2] freeswitch-stable: add utility fs_tts Utility not usable right now because it has run-time deps on plugins for TTS, which we don't have currently. But the utility is built by default, so package it. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index 0b38378..d6463e5 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -1156,5 +1156,6 @@ $(eval $(call Package/$(PKG_NAME)/Module,yuv,Raw YUV,Raw YUV I420 video codec su $(eval $(call Package/$(PKG_NAME)/Util,fs_cli,CLI,The fs_cli program is a Command-Line Interface that allows a user to\nconnect to a FreeSWITCH instance running on the local or a remote\nsystem.,,n)) $(eval $(call Package/$(PKG_NAME)/Util,fs_encode,Sound file conversion,Format conversion of sound files so the result can be used by\nmod_native_file.,+$(PKG_NAME)-mod-native-file +$(PKG_NAME)-mod-sndfile +$(PKG_NAME)-mod-spandsp,n)) $(eval $(call Package/$(PKG_NAME)/Util,fs_ivrd,IVR daemon,The FreeSWITCH IVR daemon is an abstraction layer that sits on top of\nthe ESL. The basic idea is that the ivrd will allow the user to have\na STDIN/STDOUT interface for simple call control.,,n)) +$(eval $(call Package/$(PKG_NAME)/Util,fs_tts,TTS to sound file,Use TTS to generate a sound file.,,n)) $(eval $(call Package/$(PKG_NAME)/Util,gentls_cert,TLS certificate,Can be used to create TLS certificates and setup CAs.,+openssl-util,y)) $(eval $(call Package/$(PKG_NAME)/Util,tone2wav,Sound file generation,Generates a sound file from a teletone script. The output can be in\nany format that is supported by libsndfile.,+$(PKG_NAME)-mod-sndfile,n)) From 56ffb86f2a30dd0eaf4854d1f2b00595ce0bb734 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 18 Aug 2019 12:01:19 +0200 Subject: [PATCH 2/2] freeswitch-stable: workaround libvpx compile issue The bundled libvpx got updated and now includes some extra tools. But the linker is fed with some options it doesn't like, which results in this: /builder/shared-workdir/build/sdk/staging_dir/toolchain-x86_64_gcc-7.4.0_musl/bin/x86_64-openwrt-linux-musl-ld: unrecognized option '-Wl,-rpath-link=/builder/shared-workdir/build/sdk/staging_dir/target-x86_64_musl/usr/lib/libiconv-stub/lib' /builder/shared-workdir/build/sdk/staging_dir/toolchain-x86_64_gcc-7.4.0_musl/bin/x86_64-openwrt-linux-musl-ld: use the --help option for usage information /builder/shared-workdir/build/sdk/build_dir/target-x86_64_musl/freeswitch-1.10.0.-release/libs/libvpx/tools.mk:52: recipe for target 'tools/tiny_ssim' failed make[6]: *** [tools/tiny_ssim] Error 1 freeswitch doesn't need these tools, it just needs the library, so this commit just disables them. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/patches/140-libvpx-cross.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/freeswitch-stable/patches/140-libvpx-cross.patch b/net/freeswitch-stable/patches/140-libvpx-cross.patch index c692bfb..88eda1b 100644 --- a/net/freeswitch-stable/patches/140-libvpx-cross.patch +++ b/net/freeswitch-stable/patches/140-libvpx-cross.patch @@ -11,7 +11,7 @@ + libs/libvpx/Makefile: libs/libvpx/.update - cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384 --extra-cflags="$(VISIBILITY_FLAG)" -+ cd libs/libvpx && CROSS="$(CROSS)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384 --extra-cflags="$(VISIBILITY_FLAG)" --disable-optimizations ++ cd libs/libvpx && CROSS="$(CROSS)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-tools --disable-unit-tests --size-limit=16384x16384 --extra-cflags="$(VISIBILITY_FLAG)" --disable-optimizations libs/libvpx/libvpx.a: libs/libvpx/Makefile libs/libvpx/.update @cd libs/libvpx && $(MAKE)