Merge pull request #2700 from signalwire/mp4

[mod_mp4, mod_mp4v, mod_mp4v2] Remove from tree

Author: andywolk

build/modules.conf.in

@@ -29,8 +29,6 @@ applications/mod_httapi
 #applications/mod_lcr
 #applications/mod_memcache
 #applications/mod_mongo
-#applications/mod_mp4
-#applications/mod_mp4v2
 #applications/mod_nibblebill
 #applications/mod_oreka
 #applications/mod_osp
@@ -69,7 +67,6 @@ codecs/mod_g729
 codecs/mod_h26x
 #codecs/mod_ilbc
 #codecs/mod_isac
-#codecs/mod_mp4v
 codecs/mod_opus
 #codecs/mod_silk
 #codecs/mod_siren

build/modules.conf.most

@@ -29,7 +29,6 @@ applications/mod_http_cache
 applications/mod_lcr
 applications/mod_memcache
 applications/mod_mongo
-applications/mod_mp4
 applications/mod_nibblebill
 applications/mod_oreka
 #applications/mod_osp
@@ -67,7 +66,6 @@ codecs/mod_g729
 codecs/mod_h26x
 codecs/mod_ilbc
 codecs/mod_isac
-codecs/mod_mp4v
 codecs/mod_opus
 codecs/mod_silk
 codecs/mod_siren

ci.sh

@@ -93,7 +93,6 @@ configure_freeswitch()
 			sed -i \
 				-e '/mod_ilbc/s/^/#/g' \
 				-e '/mod_isac/s/^/#/g' \
-				-e '/mod_mp4/s/^/#/g' \
 				-e '/mod_mongo/s/^/#/g' \
 				-e '/mod_pocketsphinx/s/^/#/g' \
 				-e '/mod_siren/s/^/#/g' \

configure.ac

@@ -2119,8 +2119,6 @@ AC_CONFIG_FILES([Makefile
 		src/mod/applications/mod_limit/Makefile
 		src/mod/applications/mod_memcache/Makefile
 		src/mod/applications/mod_mongo/Makefile
-		src/mod/applications/mod_mp4/Makefile
-		src/mod/applications/mod_mp4v2/Makefile
 		src/mod/applications/mod_nibblebill/Makefile
 		src/mod/applications/mod_oreka/Makefile
 		src/mod/applications/mod_osp/Makefile
@@ -2160,7 +2158,6 @@ AC_CONFIG_FILES([Makefile
 		src/mod/codecs/mod_h26x/Makefile
 		src/mod/codecs/mod_ilbc/Makefile
 		src/mod/codecs/mod_isac/Makefile
-		src/mod/codecs/mod_mp4v/Makefile
 		src/mod/codecs/mod_opus/Makefile
 		src/mod/codecs/mod_openh264/Makefile
 		src/mod/codecs/mod_silk/Makefile

debian/bootstrap.sh

@@ -35,8 +35,6 @@ supported_distros="$supported_debian_distros $supported_ubuntu_distros"
 avoid_mods=(
   applications/mod_limit
   applications/mod_mongo
-  applications/mod_mp4
-  applications/mod_mp4v2
   applications/mod_osp
   applications/mod_rad_auth
   applications/mod_skel
@@ -712,7 +710,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-g729 (= \${binary:Version}),
  freeswitch-mod-h26x (= \${binary:Version}),
  freeswitch-mod-isac (= \${binary:Version}),
- freeswitch-mod-mp4v (= \${binary:Version}),
  freeswitch-mod-opus (= \${binary:Version}),
  freeswitch-mod-silk (= \${binary:Version}),
  freeswitch-mod-spandsp (= \${binary:Version}),
@@ -738,7 +735,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-g729-dbg (= \${binary:Version}),
  freeswitch-mod-h26x-dbg (= \${binary:Version}),
  freeswitch-mod-isac-dbg (= \${binary:Version}),
- freeswitch-mod-mp4v-dbg (= \${binary:Version}),
  freeswitch-mod-opus-dbg (= \${binary:Version}),
  freeswitch-mod-silk-dbg (= \${binary:Version}),
  freeswitch-mod-spandsp-dbg (= \${binary:Version}),

debian/control-modules

@@ -149,16 +149,6 @@ Description: MongoDB
  This module provides an interface to MongoDB.
 Build-Depends: libmongoc-dev
 
-Module: applications/mod_mp4
-Section: contrib/comm
-Description: MP4 video support
- This module adds support for MP4 video playback.
-Build-Depends: libmp4v2-dev
-
-Module: applications/mod_mp4v2
-Description: Adds mod_mp4v2
- Adds mod_mp4v2.
-
 Module: applications/mod_nibblebill
 Description: Nibblebill
  This module allows for real-time accounting of a cash balance and
@@ -333,10 +323,6 @@ Module: codecs/mod_isac
 Description: mod_isac
  Adds mod_isac.
 
-Module: codecs/mod_mp4v
-Description: mod_mp4v
- Adds mod_mp4v.
-
 Module: codecs/mod_openh264
 Description: Adds mod_openh264
  Adds mod_openh264.

freeswitch.spec

@@ -722,14 +722,6 @@ Requires:       %{name} = %{version}-%{release}
 %description codec-vpx
 iSAC Codec support for FreeSWITCH open source telephony platform
 
-%package codec-mp4v
-Summary:        MP4V Video Codec support for FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description codec-mp4v
-MP4V Video Codec support for FreeSWITCH open source telephony platform
-
 %package codec-opus
 Summary:        Opus Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
@@ -1351,7 +1343,7 @@ ASR_TTS_MODULES="asr_tts/mod_flite asr_tts/mod_pocketsphinx asr_tts/mod_tts_comm
 #
 ######################################################################################################################
 CODECS_MODULES="codecs/mod_amr codecs/mod_amrwb codecs/mod_bv codecs/mod_codec2 codecs/mod_g723_1 \
-		codecs/mod_g729 codecs/mod_h26x codecs/mod_ilbc codecs/mod_isac codecs/mod_mp4v codecs/mod_opus codecs/mod_silk \
+		codecs/mod_g729 codecs/mod_h26x codecs/mod_ilbc codecs/mod_isac codecs/mod_opus codecs/mod_silk \
 		codecs/mod_siren codecs/mod_theora"
 #
 
@@ -2075,9 +2067,6 @@ fi
 %files codec-isac
 %{MODINSTDIR}/mod_isac.so*
 
-%files codec-mp4v
-%{MODINSTDIR}/mod_mp4v.so*
-
 %files codec-opus
 %{MODINSTDIR}/mod_opus.so*
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/opus.conf.xml