From d3dbc74059ffe67d24f2e483a3c2b458406e9c9b Mon Sep 17 00:00:00 2001 From: Mike Jerris Date: Thu, 29 Jun 2017 13:22:56 -0500 Subject: [PATCH] FS-10445: [build] remove mod_skypopen from build/packages sense microsoft killed it --- Freeswitch.2015.sln | 13 ------------- build/modules.conf.in | 1 - build/modules.conf.most | 1 - configure.ac | 3 +-- debian/bootstrap.sh | 2 -- debian/control-modules | 5 ----- debian/copyright | 11 ----------- freeswitch.spec | 19 +------------------ 8 files changed, 2 insertions(+), 53 deletions(-) diff --git a/Freeswitch.2015.sln b/Freeswitch.2015.sln index cb508d7db4..6e7ad69c41 100644 --- a/Freeswitch.2015.sln +++ b/Freeswitch.2015.sln @@ -410,8 +410,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\s EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skel", "src\mod\applications\mod_skel\mod_skel.2015.vcxproj", "{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skypopen", "src\mod\endpoints\mod_skypopen\mod_skypopen.2015.vcxproj", "{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 32khz music", "libs\win32\Download 32khz music.2015.vcxproj", "{1F0A8A77-E661-418F-BB92-82172AE43803}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 8khz music", "libs\win32\Download 8khz music.2015.vcxproj", "{4F5C9D55-98EF-4256-8311-32D7BD360406}" @@ -1849,16 +1847,6 @@ Global {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|x64.ActiveCfg = Debug|x64 {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|Win32.ActiveCfg = Release|Win32 {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|x64.ActiveCfg = Release|x64 - {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|Win32.ActiveCfg = Release|Win32 - {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|Win32.Build.0 = Release|Win32 - {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|x64.ActiveCfg = Release|Win32 - {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|Win32.ActiveCfg = Debug|Win32 - {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|x64.ActiveCfg = Debug|x64 - {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|x64.Build.0 = Debug|x64 - {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|Win32.ActiveCfg = Release|Win32 - {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|Win32.Build.0 = Release|Win32 - {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|x64.ActiveCfg = Release|x64 - {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|x64.Build.0 = Release|x64 {1F0A8A77-E661-418F-BB92-82172AE43803}.All|Win32.ActiveCfg = Release|Win32 {1F0A8A77-E661-418F-BB92-82172AE43803}.All|x64.ActiveCfg = Release|Win32 {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -3067,7 +3055,6 @@ Global {DEE932AB-5911-4700-9EEB-8C7090A0A330} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} - {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {1F0A8A77-E661-418F-BB92-82172AE43803} = {C120A020-773F-4EA3-923F-B67AF28B750D} {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D} diff --git a/build/modules.conf.in b/build/modules.conf.in index a40248600e..d998e5dba8 100644 --- a/build/modules.conf.in +++ b/build/modules.conf.in @@ -93,7 +93,6 @@ endpoints/mod_loopback endpoints/mod_rtc #endpoints/mod_rtmp endpoints/mod_skinny -#endpoints/mod_skypopen endpoints/mod_sofia endpoints/mod_verto #event_handlers/mod_amqp diff --git a/build/modules.conf.most b/build/modules.conf.most index 65f6331fb6..a04d3b16b2 100644 --- a/build/modules.conf.most +++ b/build/modules.conf.most @@ -90,7 +90,6 @@ endpoints/mod_portaudio endpoints/mod_rtc endpoints/mod_rtmp endpoints/mod_skinny -endpoints/mod_skypopen endpoints/mod_sofia endpoints/mod_verto event_handlers/mod_amqp diff --git a/configure.ac b/configure.ac index d1a655e827..ff71ddc65d 100644 --- a/configure.ac +++ b/configure.ac @@ -1077,7 +1077,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_dingaling mod_opal mod_skypopen mod_h323 mod_khomp +# Untested modules : mod_osp mod_soundtouch mod_sangoma_codec mod_dingaling mod_opal mod_h323 mod_khomp # mod_unimrcp mod_cepstral mod_erlang_event mod_snmp mod_perl mod_java mod_managed # #saved_CFLAGS="$CFLAGS" @@ -1860,7 +1860,6 @@ AC_CONFIG_FILES([Makefile src/mod/endpoints/mod_reference/Makefile src/mod/endpoints/mod_rtmp/Makefile src/mod/endpoints/mod_skinny/Makefile - src/mod/endpoints/mod_skypopen/Makefile src/mod/endpoints/mod_sofia/Makefile src/mod/endpoints/mod_unicall/Makefile src/mod/endpoints/mod_rtc/Makefile diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 9eca764f3a..797a3d28aa 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -650,7 +650,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-rtc (= \${binary:Version}), freeswitch-mod-rtmp (= \${binary:Version}), freeswitch-mod-skinny (= \${binary:Version}), - freeswitch-mod-skypopen (= \${binary:Version}), freeswitch-mod-sofia (= \${binary:Version}), freeswitch-mod-verto (= \${binary:Version}), freeswitch-mod-cdr-csv (= \${binary:Version}), @@ -889,7 +888,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-rtc-dbg (= \${binary:Version}), freeswitch-mod-rtmp-dbg (= \${binary:Version}), freeswitch-mod-skinny-dbg (= \${binary:Version}), - freeswitch-mod-skypopen-dbg (= \${binary:Version}), freeswitch-mod-sofia-dbg (= \${binary:Version}), freeswitch-mod-verto-dbg (= \${binary:Version}), freeswitch-mod-cdr-csv-dbg (= \${binary:Version}), diff --git a/debian/control-modules b/debian/control-modules index 74596d22f8..8880f8bba7 100644 --- a/debian/control-modules +++ b/debian/control-modules @@ -462,11 +462,6 @@ Module: endpoints/mod_skinny Description: mod_skinny Adds mod_skinny. -Module: endpoints/mod_skypopen -Description: mod_skypopen - Adds mod_skypopen. -Build-Depends: libx11-dev - Module: endpoints/mod_sofia Description: mod_sofia Adds mod_sofia. diff --git a/debian/copyright b/debian/copyright index 13d0c14385..915ab87830 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1598,17 +1598,6 @@ Files: src/mod/endpoints/mod_gsmopen/asterisk/celliax_spandsp.[ch] Copyright: 2001-2006 Steve Underwood License: GPL-2 -Files: src/mod/endpoints/mod_skypopen/oss/skypopen.h - src/mod/endpoints/mod_skypopen/oss/main.c -Copyright: 2010 Giovanni Maruzzelli - 2001 Alessandro Rubini and Jonathan Corbet - 2001 O'Reilly & Associates -License: MPL-1.1 - -Files: src/mod/endpoints/mod_skypopen/old-stuff/* -Copyright: Jaroslav Kysela -License: GPL-2+ - Files: src/mod/endpoints/mod_skinny/* src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c Copyright: 2009-2010, Mathieu Parent diff --git a/freeswitch.spec b/freeswitch.spec index dfa42da551..759553e03b 100644 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -965,20 +965,6 @@ Sangoma SMG-SS7 drivers for FreeTDM %endif -%package endpoint-skypopen -Summary: Skype Endpoint -Group: System/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libX11 -BuildRequires: libX11-devel - -%description endpoint-skypopen -This software (Skypopen) uses the Skype API but is not endorsed, certified or -otherwise approved in any way by Skype. Skypopen is an endpoint (channel -driver) that uses the Skype client as an interface to the Skype network, and -allows incoming and outgoing Skype calls to/from FreeSWITCH (that can be -bridged, originated, answered, etc. as in all other endpoints, e.g. Sofia-SIP). - ###################################################################################################################### # FreeSWITCH Event Handler Modules ###################################################################################################################### @@ -1520,7 +1506,7 @@ DIRECTORIES_MODULES="" ###################################################################################################################### ENDPOINTS_MODULES="endpoints/mod_dingaling ../../libs/freetdm/mod_freetdm \ endpoints/mod_loopback endpoints/mod_portaudio endpoints/mod_rtmp \ - endpoints/mod_skinny endpoints/mod_verto endpoints/mod_rtc endpoints/mod_skypopen endpoints/mod_sofia" + endpoints/mod_skinny endpoints/mod_verto endpoints/mod_rtc endpoints/mod_sofia" ## DISABLED MODULES DUE TO BUILD ISSUES endpoints/mod_gsmopen endpoints/mod_h323 endpoints/mod_khomp @@ -2275,9 +2261,6 @@ fi %files endpoint-rtc %{MODINSTDIR}/mod_rtc.so* -%files endpoint-skypopen -%{MODINSTDIR}/mod_skypopen.so* - ###################################################################################################################### # # FreeTDM Module for TDM Interaction