Merge pull request #2687 from signalwire/sangoma

[mod_sangoma_codec] Remove from tree

LICENSE

@@ -1582,8 +1582,7 @@ Files: libs/libcodec2/src/pack.c
 Copyright: 2010 Perens LLC <[email protected]>
 License: GPL-3+
 
-Files: src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
- src/include/switch_profile.h
+Files: src/include/switch_profile.h
  src/switch_profile.c
 Copyright: 2009,2010, Sangoma Technologies
 License: BSD-3-clause

build/modules.conf.in

@@ -75,7 +75,6 @@ codecs/mod_h26x
 #codecs/mod_isac
 #codecs/mod_mp4v
 codecs/mod_opus
-#codecs/mod_sangoma_codec
 #codecs/mod_silk
 #codecs/mod_siren
 #codecs/mod_theora

build/modules.conf.most

@@ -72,7 +72,6 @@ codecs/mod_ilbc
 codecs/mod_isac
 codecs/mod_mp4v
 codecs/mod_opus
-codecs/mod_sangoma_codec
 codecs/mod_silk
 codecs/mod_siren
 codecs/mod_theora

ci.sh

@@ -96,7 +96,6 @@ configure_freeswitch()
 				-e '/mod_mp4/s/^/#/g' \
 				-e '/mod_mongo/s/^/#/g' \
 				-e '/mod_pocketsphinx/s/^/#/g' \
-				-e '/mod_sangoma_codec/s/^/#/g' \
 				-e '/mod_siren/s/^/#/g' \
 				-e '/mod_avmd/s/^/#/g' \
 				-e '/mod_basic/s/^/#/g' \

configure.ac

@@ -1079,7 +1079,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
 fi
 
 # Tested and fixed lot of modules, but some are untested.  Will be added back when the core team decide it ready
-# Untested modules : mod_osp mod_soundtouch mod_sangoma_codec mod_opal mod_h323 mod_khomp 
+# Untested modules : mod_osp mod_soundtouch mod_opal mod_h323 mod_khomp 
 #                    mod_cepstral mod_erlang_event mod_snmp mod_perl mod_java mod_managed
 #
 #saved_CFLAGS="$CFLAGS"
@@ -2171,7 +2171,6 @@ AC_CONFIG_FILES([Makefile
 		src/mod/codecs/mod_mp4v/Makefile
 		src/mod/codecs/mod_opus/Makefile
 		src/mod/codecs/mod_openh264/Makefile
-		src/mod/codecs/mod_sangoma_codec/Makefile
 		src/mod/codecs/mod_silk/Makefile
 		src/mod/codecs/mod_siren/Makefile
 		src/mod/codecs/mod_skel_codec/Makefile

debian/bootstrap.sh

@@ -46,7 +46,6 @@ avoid_mods=(
   codecs/mod_com_g729
   codecs/mod_openh264
   codecs/mod_siren
-  codecs/mod_sangoma_codec
   codecs/mod_skel_codec
   endpoints/mod_h323
   endpoints/mod_khomp

debian/control-modules

@@ -360,11 +360,6 @@ Description: mod_opus
  Adds mod_opus.
 Build-Depends: libopus-dev
 
-Module: codecs/mod_sangoma_codec
-Description: mod_sangoma_codec
- Adds mod_sangoma_codec.
-Build-Depends: libsngtc-dev
-
 Module: codecs/mod_silk
 Description: mod_silk
  Adds mod_silk.

debian/copyright

@@ -1582,12 +1582,6 @@ Files: libs/libcodec2/src/pack.c
 Copyright: 2010 Perens LLC <[email protected]>
 License: GPL-3+
 
-Files: src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
- src/include/switch_profile.h
- src/switch_profile.c
-Copyright: 2009,2010, Sangoma Technologies
-License: BSD-3-clause
-
 Files: src/mod/codecs/mod_isac/*
 Copyright: 2011-2012 The WebRTC project authors
 License: BSD-3-clause

freeswitch.spec

@@ -29,17 +29,11 @@
 #
 ######################################################################################################################
 # Module build settings
-%define build_sng_isdn 0
-%define build_sng_ss7 0
-%define build_sng_tc 0
 %define build_py26_esl 0
 %define build_timerfd 0
 %define build_mod_esl 0
 %define build_mod_v8 0
 
-%{?with_sang_tc:%define build_sng_tc 1 }
-%{?with_sang_isdn:%define build_sng_isdn 1 }
-%{?with_sang_ss7:%define build_sng_ss7 1 }
 %{?with_py26_esl:%define build_py26_esl 1 }
 %{?with_timerfd:%define build_timerfd 1 }
 %{?with_mod_esl:%define build_mod_esl 1 }
@@ -746,19 +740,6 @@ BuildRequires:  opus-devel >= 1.1
 %description codec-opus
 OPUS Codec support for FreeSWITCH open source telephony platform
 
-%if %{build_sng_tc}
-%package sangoma-codec
-Summary:	Sangoma D100 and D500 Codec Card Support
-Group:		System/Libraries
-Requires:        %{name} = %{version}-%{release}
-Requires: sng-tc-linux
-BuildRequires: sng-tc-linux
-
-%description sangoma-codec
-Sangoma D100 and D500 Codec Card Support
-
-%endif
-
 %package codec-silk
 Summary:        Silk Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
@@ -1394,9 +1375,6 @@ CODECS_MODULES="codecs/mod_amr codecs/mod_amrwb codecs/mod_bv codecs/mod_codec2
 		codecs/mod_g729 codecs/mod_h26x codecs/mod_ilbc codecs/mod_isac codecs/mod_mp4v codecs/mod_opus codecs/mod_silk \
 		codecs/mod_siren codecs/mod_theora"
 #
-%if %{build_sng_tc}
-CODECS_MODULES+="codecs/mod_sangoma_codec"
-%endif
 
 ######################################################################################################################
 #
@@ -1648,17 +1626,6 @@ cd ../..
 #
 ######################################################################################################################
 
-%if %{build_sng_ss7}
-#do not delete a thing
-%else
-%{__rm} -f %{buildroot}/%{MODINSTDIR}/ftmod_sangoma_ss7*
-%endif
-%if %{build_sng_isdn}
-#do not delete a thing
-%else
-%{__rm} -f %{buildroot}/%{MODINSTDIR}/ftmod_sangoma_isdn*
-%endif
-
 %{__rm} -f %{buildroot}/%{LIBDIR}/*.la
 %{__rm} -f %{buildroot}/%{MODINSTDIR}/*.la
 
@@ -1886,7 +1853,6 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/redis.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/rss.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/rtmp.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/sangoma_codec.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/shout.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/signalwire.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/skinny.conf.xml
@@ -2140,11 +2106,6 @@ fi
 %{MODINSTDIR}/mod_opus.so*
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/opus.conf.xml
 
-%if %{build_sng_tc}
-%files sangoma-codec
-%{MODINSTDIR}/mod_sangoma_codec.so*
-%endif
-
 %files codec-silk
 %{MODINSTDIR}/mod_silk.so*