From: Bernd Kuhls Date: Fri, 6 Oct 2017 20:28:29 +0000 (+0200) Subject: package/freeswitch: Use mod_g729 only when freeswitch-mod-bcg729 is disabled X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8f46658d0457fd6e0b1dd7cebd82ccba57c05862;p=buildroot.git package/freeswitch: Use mod_g729 only when freeswitch-mod-bcg729 is disabled mod_g729 contained in freeswitch source provides pass-through: https://freeswitch.org/confluence/display/FREESWITCH/mod_g729 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index ce22ffc28f..defa00f47a 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -116,7 +116,6 @@ FREESWITCH_ENABLED_MODULES += \ applications/mod_valet_parking \ applications/mod_voicemail \ codecs/mod_g723_1 \ - codecs/mod_g729 \ dialplans/mod_dialplan_asterisk \ dialplans/mod_dialplan_xml \ endpoints/mod_loopback \ @@ -175,6 +174,12 @@ FREESWITCH_DEPENDENCIES += alsa-lib FREESWITCH_ENABLED_MODULES += endpoints/mod_alsa endif +# Use the pass-through g729 module provided by freeswitch instead of +# the external mod_bcg729 provided by freeswitch-mod-bcg729. +ifeq ($(BR2_PACKAGE_FREESWITCH_MOD_BCG729),) +FREESWITCH_ENABLED_MODULES += codecs/mod_g729 +endif + ifeq ($(BR2_PACKAGE_FREETYPE),y) FREESWITCH_DEPENDENCIES += freetype endif