freeswitch-stable: Add options to include more libs

- added symbols to Config.in to enable additional libs
- libs are: freetype, libpng, libyuv (internal), libvpx (internal)
- they're not enabled by default

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-05-21 00:31:23 +02:00
parent 4aac26a247
commit 3822ad7e59
3 changed files with 42 additions and 5 deletions

View file

@ -9,6 +9,12 @@ config FS_STABLE_WITH_DEBUG
want to get meaningful backtraces see want to get meaningful backtraces see
https://wiki.openwrt.org/doc/devel/debugging for starting points. https://wiki.openwrt.org/doc/devel/debugging for starting points.
config FS_STABLE_WITH_FREETYPE
bool "Compile with FreeType support"
default n
help
Add FreeType support to FreeSWITCH
config FS_STABLE_WITH_LIBEDIT config FS_STABLE_WITH_LIBEDIT
bool "Compile with libedit support" bool "Compile with libedit support"
default y default y
@ -18,6 +24,12 @@ config FS_STABLE_WITH_LIBEDIT
with FreeSWITCH (without it it doesn't feel very interactive at all), with FreeSWITCH (without it it doesn't feel very interactive at all),
but it adds additional dependencies (libedit, libncursesw, terminfo). but it adds additional dependencies (libedit, libncursesw, terminfo).
config FS_STABLE_WITH_LIBYUV
bool "Compile with libyuv support"
default n
help
Add libyuv support to FreeSWITCH
config FS_STABLE_WITH_ODBC config FS_STABLE_WITH_ODBC
bool "Compile with ODBC support" bool "Compile with ODBC support"
default n default n
@ -30,12 +42,24 @@ config FS_STABLE_WITH_PGSQL
help help
Enable PostgreSQL support. Enable PostgreSQL support.
config FS_STABLE_WITH_PNG
bool "Compile with PNG support"
default n
help
Add PNG support to FreeSWITCH
config FS_STABLE_WITH_SRTP config FS_STABLE_WITH_SRTP
bool "Enable SRTP" bool "Enable SRTP"
default y default y
help help
Compile with SRTP support. Compile with SRTP support.
config FS_STABLE_WITH_VPX
bool "Compile with VPx support"
default n
help
Compile with VPx video codec support
config FS_STABLE_WITH_ZRTP config FS_STABLE_WITH_ZRTP
bool "Enable ZRTP" bool "Enable ZRTP"
default n default n

View file

@ -70,8 +70,10 @@ FS_STABLE_DEPS_BASE:= \
FS_STABLE_DEPS:= \ FS_STABLE_DEPS:= \
$(FS_STABLE_DEPS_BASE) \ $(FS_STABLE_DEPS_BASE) \
+FS_STABLE_WITH_FREETYPE:libfreetype \
+FS_STABLE_WITH_LIBEDIT:libedit \ +FS_STABLE_WITH_LIBEDIT:libedit \
+FS_STABLE_WITH_ODBC:unixodbc \ +FS_STABLE_WITH_ODBC:unixodbc \
+FS_STABLE_WITH_PNG:libpng \
+libcurl \ +libcurl \
+libpcre \ +libpcre \
+libpthread \ +libpthread \
@ -455,8 +457,6 @@ CONFIGURE_ARGS+= \
--srcdir=$(PKG_BUILD_DIR) \ --srcdir=$(PKG_BUILD_DIR) \
--sysconfdir=/etc \ --sysconfdir=/etc \
--disable-dependency-tracking \ --disable-dependency-tracking \
--disable-libvpx \
--disable-libyuv \
--disable-static \ --disable-static \
--disable-system-xmlrpc-c \ --disable-system-xmlrpc-c \
--enable-fhs \ --enable-fhs \
@ -475,17 +475,19 @@ CONFIGURE_ARGS+= \
--with-soundsdir=/usr/share/$(PRG_NAME)/sounds \ --with-soundsdir=/usr/share/$(PRG_NAME)/sounds \
--with-storagedir=/tmp/$(PRG_NAME)/storage \ --with-storagedir=/tmp/$(PRG_NAME)/storage \
--without-erlang \ --without-erlang \
--without-freetype \
--without-png \
--without-python \ --without-python \
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_LIBEDIT,core-libedit-support) \ $(call autoconf_bool,CONFIG_FS_STABLE_WITH_LIBEDIT,core-libedit-support) \
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_ODBC,core-odbc-support) \ $(call autoconf_bool,CONFIG_FS_STABLE_WITH_ODBC,core-odbc-support) \
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_SRTP,srtp) \ $(call autoconf_bool,CONFIG_FS_STABLE_WITH_SRTP,srtp) \
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_ZRTP,zrtp) \ $(call autoconf_bool,CONFIG_FS_STABLE_WITH_ZRTP,zrtp) \
$(if $(CONFIG_FS_STABLE_WITH_DEBUG),,--disable-debug) \ $(if $(CONFIG_FS_STABLE_WITH_DEBUG),,--disable-debug) \
$(if $(CONFIG_FS_STABLE_WITH_FREETYPE),,--without-freetype) \
$(if $(CONFIG_FS_STABLE_WITH_LIBYUV),,--disable-libyuv) \
$(if $(CONFIG_FS_STABLE_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)/usr/lib") \ $(if $(CONFIG_FS_STABLE_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)/usr/lib") \
$(if $(CONFIG_FS_STABLE_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \ $(if $(CONFIG_FS_STABLE_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \
$(if $(CONFIG_FS_STABLE_WITH_PGSQL),--enable-core-pgsql-support,--without-pgsql) $(if $(CONFIG_FS_STABLE_WITH_PGSQL),--enable-core-pgsql-support,--without-pgsql) \
$(if $(CONFIG_FS_STABLE_WITH_PNG),,--without-png) \
$(if $(CONFIG_FS_STABLE_WITH_VPX),,--disable-libvpx)
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)

View file

@ -0,0 +1,11 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -550,7 +550,7 @@ libs/libzrtp/libzrtp.a:
cd libs/libzrtp && $(MAKE)
libs/libvpx/Makefile:
- 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 --extra-cflags="$(VISIBILITY_FLAG)"
+ cd libs/libvpx && CROSS="$(CROSS)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
libs/libvpx/libvpx.a: libs/libvpx/Makefile
@cd libs/libvpx && $(MAKE)