From c9aa35227aa0537163d4d0e6231d8f1abd95a6ac Mon Sep 17 00:00:00 2001 From: Mike Jerris Date: Thu, 16 Feb 2017 17:49:03 -0600 Subject: [PATCH] FS-10050: fix build issues and add mod_video_filter to packages --- build/modules.conf.in | 2 +- build/modules.conf.most | 1 + debian/bootstrap.sh | 2 ++ debian/control-modules | 4 ++++ freeswitch.spec | 14 +++++++++++++- src/mod/applications/mod_video_filter/Makefile.am | 8 ++++---- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/build/modules.conf.in b/build/modules.conf.in index 1a53a27768..219e943ba0 100644 --- a/build/modules.conf.in +++ b/build/modules.conf.in @@ -1,6 +1,5 @@ #applications/mod_abstraction #applications/mod_av -#applications/mod_video_filter #applications/mod_avmd #applications/mod_bert #applications/mod_blacklist @@ -51,6 +50,7 @@ applications/mod_spandsp #applications/mod_stress #applications/mod_translate applications/mod_valet_parking +#applications/mod_video_filter #applications/mod_vmd applications/mod_voicemail #applications/mod_voicemail_ivr diff --git a/build/modules.conf.most b/build/modules.conf.most index 3becf53b28..65f6331fb6 100644 --- a/build/modules.conf.most +++ b/build/modules.conf.most @@ -48,6 +48,7 @@ applications/mod_spy applications/mod_stress applications/mod_translate applications/mod_valet_parking +applications/mod_video_filter applications/mod_vmd applications/mod_voicemail applications/mod_voicemail_ivr diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 5d796d2e67..e250ebe179 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -632,6 +632,7 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-stress (= \${binary:Version}), freeswitch-mod-translate (= \${binary:Version}), freeswitch-mod-valet-parking (= \${binary:Version}), + freeswitch-mod-video_filter (= \${binary:Version}), freeswitch-mod-voicemail (= \${binary:Version}), freeswitch-mod-voicemail-ivr (= \${binary:Version}), freeswitch-mod-flite (= \${binary:Version}), @@ -870,6 +871,7 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-stress-dbg (= \${binary:Version}), freeswitch-mod-translate-dbg (= \${binary:Version}), freeswitch-mod-valet-parking-dbg (= \${binary:Version}), + freeswitch-mod-video_filter-dbg (= \${binary:Version}), freeswitch-mod-voicemail-dbg (= \${binary:Version}), freeswitch-mod-voicemail-ivr-dbg (= \${binary:Version}), freeswitch-mod-flite-dbg (= \${binary:Version}), diff --git a/debian/control-modules b/debian/control-modules index fc87d47c05..74596d22f8 100644 --- a/debian/control-modules +++ b/debian/control-modules @@ -250,6 +250,10 @@ Module: applications/mod_valet_parking Description: Valet parking This module implements the valet call parking strategy. +Module: applications/mod_video_filter +Description: Video filter chromakey + This module provides a media bug for chromakey functionality + Module: applications/mod_vmd Description: Voicemail detection This module detects voicemail beeps at any frequency in O(1) time. diff --git a/freeswitch.spec b/freeswitch.spec index ed3c1ae36c..005d04fd87 100644 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -609,6 +609,14 @@ Provides FreeSWITCH mod_valet_parking. Provides 'Call Parking' in the switch as opposed to on the phone and allows for a number of options to handle call retrieval +%package application-video_filter +Summary: FreeSWITCH video filter bugs +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description application-video_filter +Provide a chromakey video filter media bug + %package application-voicemail Summary: FreeSWITCH mod_voicemail Group: System/Libraries @@ -1366,6 +1374,7 @@ Requires: freeswitch-application-soundtouch Requires: freeswitch-application-spy Requires: freeswitch-application-stress Requires: freeswitch-application-valet_parking +Requires: freeswitch-application-video_filter Requires: freeswitch-application-voicemail Requires: freeswitch-application-voicemail-ivr Requires: freeswitch-codec-passthru-amr @@ -1446,7 +1455,7 @@ APPLICATION_MODULES_FR="applications/mod_fifo applications/mod_fsk applications/ APPLICATION_MODULES_SZ="applications/mod_sms applications/mod_snapshot applications/mod_snom applications/mod_soundtouch \ applications/mod_spandsp applications/mod_spy applications/mod_stress \ applications/mod_valet_parking applications/mod_translate applications/mod_voicemail \ - applications/mod_voicemail_ivr" + applications/mod_voicemail_ivr applications/mod_video_filter" APPLICATIONS_MODULES="$APPLICATION_MODULES_AC $APPLICATION_MODULES_DE $APPLICATION_MODULES_FR $APPLICATION_MODULES_SZ" @@ -2121,6 +2130,9 @@ fi %files application-valet_parking %{MODINSTDIR}/mod_valet_parking.so* +%files application-video_filter +%{MODINSTDIR}/mod_video_filter.so* + %files application-voicemail %{MODINSTDIR}/mod_voicemail.so* diff --git a/src/mod/applications/mod_video_filter/Makefile.am b/src/mod/applications/mod_video_filter/Makefile.am index 643fb67223..48b6c6fab3 100644 --- a/src/mod/applications/mod_video_filter/Makefile.am +++ b/src/mod/applications/mod_video_filter/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_video_filter mod_LTLIBRARIES = mod_video_filter.la -mod_av_la_SOURCES = mod_video_filter.c -mod_av_la_CFLAGS = $(AM_CFLAGS) -mod_av_la_LIBADD = $(switch_builddir)/libfreeswitch.la -mod_av_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm -lz +mod_video_filter_la_SOURCES = mod_video_filter.c +mod_video_filter_la_CFLAGS = $(AM_CFLAGS) +mod_video_filter_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_video_filter_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm -lz