From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Fri, 30 Dec 2016 11:29:39 +0100 Subject: [Buildroot] [PATCH 38/52] package/libpjsip: add option to enable GSM codec In-Reply-To: References: Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Signed-off-by: "Yann E. MORIN" --- package/libpjsip/Config.in | 12 ++++++++++++ package/libpjsip/libpjsip.mk | 14 +++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in index 727d2ec..ce15a20 100644 --- a/package/libpjsip/Config.in +++ b/package/libpjsip/Config.in @@ -10,5 +10,17 @@ config BR2_PACKAGE_LIBPJSIP http://www.pjsip.org +if BR2_PACKAGE_LIBPJSIP + +config BR2_PACKAGE_LIBPJSIP_CODEC_GSM + bool "GSM codec" + depends on !BR2_STATIC_LIBS # libgsm + select BR2_PACKAGE_LIBGSM + +comment "GSM codec needs a toolchain w/ shared libraries" + depends on BR2_STATIC_LIBS + +endif # BR2_PACKAGE_LIBPJSIP + comment "libpjsip needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 551dbd9..3396422 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -26,7 +26,6 @@ LIBPJSIP_CONF_ENV = \ LIBPJSIP_CONF_OPTS = \ --disable-sound \ - --disable-gsm-codec \ --disable-speex-codec \ --disable-speex-aec \ --disable-resample \ @@ -66,4 +65,17 @@ ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) LIBPJSIP_DEPENDENCIES += util-linux endif +# Codecs can only be disabled. If explictly enabled, the check is +# omitted (but successful), and there is no configure trace "Checking +# if [codec] codec is disabled...no". So we only explicitly disable it +# and we do not explictly enable it, so we get the configure log in +# both cases. + +ifeq ($(BR2_PACKAGE_LIBPJSIP_CODEC_GSM),y) +LIBPJSIP_DEPENDENCIES += libgsm +LIBPJSIP_CONF_OPTS += --with-external-gsm +else +LIBPJSIP_CONF_OPTS += --disable-gsm-codec +endif + $(eval $(autotools-package)) -- 2.7.4