Commit c8d17a46ce for freeswitch.com
commit c8d17a46ce47e5566b91d384dd3c34d3236eea6d
Author: Andrey Volk <andywolk@gmail.com>
Date: Tue Sep 29 18:14:56 2026 +0300
[mod_com_g729] Remove from tree. Use Debian packages. (#3200)
diff --git a/.gitignore b/.gitignore
index b220bcec97..f4adb571b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,7 +104,6 @@ Release/
/build/freeswitch.pc
/build/standalone_module/freeswitch.pc
/build/getlib.sh
-/build/getg729.sh
/build/getsounds.sh
/build/Makefile
/build/Makefile.in
@@ -116,7 +115,6 @@ Release/
/libs/esl/fs_ivrd
/libs/esl/testclient
/libs/esl/testserver
-/libs/fsg729-*-installer
/libs/g729/
/libs/libcodec2/compile
/libs/libcodec2/config.guess
@@ -148,8 +146,6 @@ Release/
/src/mod/applications/mod_snipe_hunt/Makefile
/src/mod/applications/mod_test/test/Makefile
/src/mod/applications/mod_test/test/Makefile.in
-/src/mod/codecs/mod_com_g729/Makefile
-/src/mod/codecs/mod_com_g729/Makefile.in
/src/mod/dialplans/mod_dialplan_directory/Makefile
/src/mod/formats/mod_shell_stream/Makefile
/src/mod/languages/mod_lua/mod_lua_wrap.cpp.orig
diff --git a/build/getg729.sh.in b/build/getg729.sh.in
deleted file mode 100755
index d37ac1f47e..0000000000
--- a/build/getg729.sh.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-TAR=@TAR@
-ZCAT=@ZCAT@
-WGET=@WGET@
-CURL=@CURL@
-
-if [ -f "$WGET" ] ; then
- DOWNLOAD_CMD=$WGET
-else
- if [ -f "$CURL" ] ; then
- DOWNLOAD_CMD="$CURL -L -O"
- fi
-fi
-
-base=http://files.freeswitch.org/g729/
-tarfile=$1
-url=`echo $tarfile | grep "://"`
-
-if [ ! -z $url ] ; then
- base=$tarfile/
- tarfile=$2
-fi
-
-if [ ! -f $tarfile ] ; then
- $DOWNLOAD_CMD $base$tarfile
- if [ ! -f $tarfile ] ; then
- echo cannot find $tarfile
- exit 1
- fi
-fi
-
-exit 0
-
diff --git a/build/modules.conf.in b/build/modules.conf.in
index 9b2e360811..da42dcf11d 100755
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -52,7 +52,6 @@ codecs/mod_amr
codecs/mod_b64
#codecs/mod_bv
#codecs/mod_codec2
-#codecs/mod_com_g729
codecs/mod_g723_1
codecs/mod_g729
#codecs/mod_ilbc
diff --git a/build/modules.conf.most b/build/modules.conf.most
index 6b4427b0ee..222298f4b6 100755
--- a/build/modules.conf.most
+++ b/build/modules.conf.most
@@ -52,7 +52,6 @@ codecs/mod_amrwb
codecs/mod_b64
codecs/mod_bv
codecs/mod_codec2
-#codecs/mod_com_g729
codecs/mod_g723_1
codecs/mod_g729
codecs/mod_ilbc
diff --git a/conf/testing/autoload_configs/modules.conf.xml b/conf/testing/autoload_configs/modules.conf.xml
index 7c65886a9e..c36844bbc1 100644
--- a/conf/testing/autoload_configs/modules.conf.xml
+++ b/conf/testing/autoload_configs/modules.conf.xml
@@ -33,6 +33,5 @@
<load module="mod_xml_curl"/>
<load module="mod_say_en"/>
<load module="mod_com_amd"/>
- <load module="mod_com_g729"/>
</modules>
</configuration>
diff --git a/configure.ac b/configure.ac
index 16af18ce2d..4a27adfaca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1249,8 +1249,6 @@ AC_PATH_PROGS(WGET, wget)
AC_PATH_PROGS(CURL, curl)
GETLIB="cd $switch_srcdir/libs && ${SHELL} $switch_builddir/build/getlib.sh"
AC_SUBST(GETLIB)
-GETG729="cd $switch_srcdir/libs && ${SHELL} $switch_builddir/build/getg729.sh"
-AC_SUBST(GETG729)
GETSOUNDS="${SHELL} $switch_builddir/build/getsounds.sh"
AC_SUBST(GETSOUNDS)
@@ -2093,7 +2091,6 @@ AC_CONFIG_FILES([Makefile
src/mod/codecs/mod_b64/Makefile
src/mod/codecs/mod_bv/Makefile
src/mod/codecs/mod_codec2/Makefile
- src/mod/codecs/mod_com_g729/Makefile
src/mod/codecs/mod_g723_1/Makefile
src/mod/codecs/mod_g729/Makefile
src/mod/codecs/mod_ilbc/Makefile
@@ -2183,7 +2180,6 @@ AC_CONFIG_FILES([Makefile
src/include/switch_am_config.h
build/getsounds.sh
build/getlib.sh
- build/getg729.sh
build/freeswitch.pc
build/standalone_module/freeswitch.pc
build/modmake.rules
diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index 85a71b2a83..7a376097cd 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -38,7 +38,6 @@ avoid_mods=(
applications/mod_osp
applications/mod_skel
applications/mod_cluechoo
- codecs/mod_com_g729
codecs/mod_openh264
codecs/mod_siren
codecs/mod_skel_codec
diff --git a/debian/control-modules b/debian/control-modules
index c33b873a88..6d10b6d116 100755
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -263,10 +263,6 @@ Description: mod_codec2
Adds mod_codec2.
Build-Depends: libcodec2-dev
-Module: codecs/mod_com_g729
-Description: mod_com_g729
- Adds mod_com_g729.
-
Module: codecs/mod_g723_1
Description: mod_g723_1
Adds mod_g723_1.
diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
index e1cc13fb6d..97911d1ba3 100644
--- a/src/mod/Makefile.am
+++ b/src/mod/Makefile.am
@@ -58,7 +58,7 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL
fi ; \
fi ; \
if test -z "$$target" ; then target="all" ; fi ; \
- if ! test -z "$$fail" || ! test -f $$moddir/$$modname.c && ! test -f $$moddir/$$modname.cpp && test $$modname != "mod_com_g729" ; \
+ if ! test -z "$$fail" || ! test -f $$moddir/$$modname.c && ! test -f $$moddir/$$modname.cpp ; \
then echo ; echo "WARNING $$modname is not a valid FreeSWITCH module dir, skipping it..." ; else \
if test "$$target" != "print_tests" ; then echo; echo making $$target $$modname ; fi;\
test -d "$$buildmoddir" || mkdir -p $$buildmoddir ; \
@@ -72,9 +72,6 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL
test -z "$$fail" ; \
fi;
-mod_com_g729-activate:
- cd $(switch_builddir)/src/mod/codecs/mod_com_g729 && $(MAKE) $(AM_MAKEFLAGS) activate
-
.DEFAULT:
@if test -z "`echo $@ | grep '\-all$$'`"; then $(MAKE) $(AM_MAKEFLAGS) $@-all ; else echo Unknown target `echo $@ | sed -e 's|-all||'`; exit 1; fi
diff --git a/src/mod/codecs/mod_com_g729/Makefile.am b/src/mod/codecs/mod_com_g729/Makefile.am
deleted file mode 100644
index 128a9f9628..0000000000
--- a/src/mod/codecs/mod_com_g729/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-
-MODNAME=mod_com_g729
-VERSION=latest
-
-if ISLINUX
-
-G729INSTALLER = $(top_srcdir)/libs/fs-$(VERSION)-installer
-LICSERVER=/usr/sbin/freeswitch-license-server
-VALIDATOR=$(bindir)/freeswitch-license-validator
-MOD=$(moddir)/mod_com_g729.so
-BUILT_SOURCES = $(G729INSTALLER)
-
-install: $(LICSERVER) $(VALIDATOR) $(MOD)
-
-$(LICSERVER) $(VALIDATOR) $(MOD): $(G729INSTALLER)
- $(SHELL) $(G729INSTALLER) $(bindir) $(moddir) nobanner
- @echo
- @echo
- @echo Now you can activate your license by running $(MAKE) mod_com_g729-activate
- @echo
- @echo
-
-$(G729INSTALLER):
- rm -f $(top_srcdir)/libs/fs-*-installer*
- $(GETG729) fs-$(VERSION)-installer
- chmod 755 $(G729INSTALLER)
-
-clean:
- rm -f $(top_srcdir)/libs/fs-*-installer*
- rm -rf /tmp/fsg729
-
-activate: $(LICSERVER) $(VALIDATOR) $(MOD)
- $(VALIDATOR)
-
-uninstall: clean
- rm -f $(LICSERVER) $(VALIDATOR) $(MOD)
-
-endif