From d5e0757b1187918b3875958e9dfbb962999e88ec Mon Sep 17 00:00:00 2001 From: Mazi Lo Date: Thu, 24 Jul 2014 00:29:26 -0400 Subject: [PATCH] FreeSWITCH: 1. Bump to git HEAD 3d5d8163b329f86aafed087815a51494ce50ce1a 2. Fix mod-erlang-event 3. Remove mod-speex 4. Add mod-rtc, mod-perl, and mod-verto. The last two modules depend on perl target binary package which is currently omitted from OpenWRT. As such, they are flagged as BROKEN. 5. Since FS no longer maintains and/or provides in-tree version of portaudio library, both mod-portaudio and mod-portaudio-stream are flagged as BROKEN. 6. Clean up and/or remove all staging paths from all libtool control file names (.la). Signed-off-by: Mazi Lo --- ...-mod-endpoints-mod_verto-Makefile_am.patch | 28 ++++++++++++++++ ...c-mod-languages-mod_perl-Makefile_am.patch | 32 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 net/freeswitch/patches/1307161-src-mod-endpoints-mod_verto-Makefile_am.patch create mode 100644 net/freeswitch/patches/1310040-src-mod-languages-mod_perl-Makefile_am.patch diff --git a/net/freeswitch/patches/1307161-src-mod-endpoints-mod_verto-Makefile_am.patch b/net/freeswitch/patches/1307161-src-mod-endpoints-mod_verto-Makefile_am.patch new file mode 100644 index 0000000..e1411aa --- /dev/null +++ b/net/freeswitch/patches/1307161-src-mod-endpoints-mod_verto-Makefile_am.patch @@ -0,0 +1,28 @@ +--- a/src/mod/endpoints/mod_verto/Makefile.am ++++ b/src/mod/endpoints/mod_verto/Makefile.am +@@ -9,19 +9,19 @@ mod_verto_la_LIBADD = $(switch_builddi + mod_verto_la_LDFLAGS = -avoid-version -module -no-undefined -shared + + if HAVE_PERL +-#perldir = $(PERL_SITEDIR) +-noinst_LTLIBRARIES = MCAST.la ++perldir = "$(PERL_SITELIB)" ++perl_LTLIBRARIES = MCAST.la + MCAST_la_SOURCES = mcast/mcast_wrap.cpp mcast/perlxsi.c mcast/mcast.c mcast/mcast_cpp.cpp + MCAST_la_CFLAGS = $(CC_CFLAGS) $(CFLAGS) $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS) + MCAST_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) $(CXXFLAGS) -w $(PERL_INC) + MCAST_la_CPPFLAGS = -I$(switch_srcdir)/src/mod/endpoints/mod_verto/mcast + MCAST_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS) + +-#install-data-local: perlmod-install ++install-data-local: perlmod-install + +-#perlmod-install: install-perlLTLIBRARIES +-# install -d -m 755 $(DESTDIR)$(PERL_SITEDIR) +-# install -m 755 mcast/MCAST.pm $(DESTDIR)$(PERL_SITEDIR) ++perlmod-install: install-perlLTLIBRARIES ++ install -d -m 755 $(DESTDIR)$(perldir) ++ install -m 755 mcast/MCAST.pm $(DESTDIR)$(perldir) + endif + + mcast/esl_wrap.cpp: diff --git a/net/freeswitch/patches/1310040-src-mod-languages-mod_perl-Makefile_am.patch b/net/freeswitch/patches/1310040-src-mod-languages-mod_perl-Makefile_am.patch new file mode 100644 index 0000000..c6a1588 --- /dev/null +++ b/net/freeswitch/patches/1310040-src-mod-languages-mod_perl-Makefile_am.patch @@ -0,0 +1,32 @@ +--- a/src/mod/languages/mod_perl/Makefile.am ++++ b/src/mod/languages/mod_perl/Makefile.am +@@ -1,22 +1,22 @@ + include $(top_srcdir)/build/modmake.rulesam + MODNAME=mod_perl +-PERL = perl +-PERL_LIBDIR =-L`perl -MConfig -e 'print $$Config{archlib}'`/CORE +-PERL_LIBS =`perl -MConfig -e 'print $$Config{libs}'` + +-perldir=$(prefix)/perl ++perldir="$(PERL_SITELIB)" ++ + mod_LTLIBRARIES = mod_perl.la + perl_LTLIBRARIES = freeswitch.la + mod_perl_la_SOURCES = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c + mod_perl_la_CFLAGS = $(AM_CFLAGS) + mod_perl_la_CXXFLAGS = $(AM_CXXFLAGS) +-mod_perl_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ ++mod_perl_la_CPPFLAGS = ${PERL_CFLAGS} -I$(switch_srcdir)/libs/libteletone/src/ + mod_perl_la_LIBADD = $(switch_builddir)/libfreeswitch.la +-mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'` ++#mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'` ++mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared ${PERL_LDFLAGS} + + freeswitch_la_SOURCES = freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c + freeswitch_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(LDFLAGS) +-freeswitch_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ ++freeswitch_la_CPPFLAGS = ${PERL_CFLAGS} -I$(switch_srcdir)/libs/libteletone/src/ ++ + reswig: swigclean mod_perl_wrap.cpp + + swigclean: clean -- 2.30.2