Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:dddh
freeswitch-1.6
mod-backport.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File mod-backport.patch of Package freeswitch-1.6
--- freeswitch-1.6.9/src/mod/codecs/mod_bv/Makefile.am 2016-06-13 20:17:45.000000000 +0000 +++ freeswitch-1.4.26/src/mod/codecs/mod_bv/Makefile.am 2016-01-12 01:08:16.000000000 +0000 @@ -1,18 +1,17 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_bv -if HAVE_BROADVOICE +BV_DIR=$(switch_srcdir)/libs/broadvoice +BV_BUILDDIR=$(switch_builddir)/libs/broadvoice +BV_LA=$(BV_BUILDDIR)/src/.libs/libbroadvoice.la +BUILT_SOURCES=$(BV_LA) mod_LTLIBRARIES = mod_bv.la mod_bv_la_SOURCES = mod_bv.c -mod_bv_la_CFLAGS = $(AM_CFLAGS) $(BROADVOICE_CFLAGS) -mod_bv_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(BROADVOICE_LIBS) +mod_bv_la_CFLAGS = $(AM_CFLAGS) -I$(BV_BUILDDIR)/src -I$(BV_DIR)/src +mod_bv_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(BV_LA) mod_bv_la_LDFLAGS = -avoid-version -module -no-undefined -shared - -else -install: error -all: error -error: - $(error You must install libbroadvoice-dev to build mod_bv) -endif +$(BV_LA): $(BV_DIR)/.update + cd $(BV_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) --- freeswitch-1.6.9/src/mod/codecs/mod_codec2/Makefile.am 2016-06-13 20:17:45.000000000 +0000 +++ freeswitch-1.4.26/src/mod/codecs/mod_codec2/Makefile.am 2016-01-12 01:08:16.000000000 +0000 @@ -1,17 +1,19 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_codec2 -if HAVE_CODEC2 +CODEC2_DIR=$(switch_srcdir)/libs/libcodec2 +CODEC2_BUILDDIR=$(switch_builddir)/libs/libcodec2 +CODEC2LA=$(CODEC2_BUILDDIR)/src/libcodec2.la mod_LTLIBRARIES = mod_codec2.la mod_codec2_la_SOURCES = mod_codec2.c -mod_codec2_la_CFLAGS = $(AM_CFLAGS) $(CODEC2_CFLAGS) -mod_codec2_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(CODEC2_LIBS) +mod_codec2_la_CFLAGS = $(AM_CFLAGS) -I$(CODEC2_DIR)/include -I$(CODEC2_BUILDDIR)/src -I$(CODEC2_DIR)/src +mod_codec2_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(CODEC2LA) mod_codec2_la_LDFLAGS = -avoid-version -module -no-undefined -shared -else -install: error -all: error -error: - $(error You must install libcodec2-dev to build mod_codec2) -endif +BUILT_SOURCES=$(CODEC2LA) + +$(CODEC2LA): $(CODEC2_DIR) $(CODEC2_DIR)/.update + cd $(CODEC2_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) + --- freeswitch-1.6.9/src/mod/asr_tts/mod_flite/Makefile.am 2016-06-13 20:17:45.000000000 +0000 +++ freeswitch-1.4.26/src/mod/asr_tts/mod_flite/Makefile.am 2016-01-12 01:08:16.000000000 +0000 @@ -1,17 +1,38 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_flite -if HAVE_FLITE +FLITE=flite-2.0.0 + +FLITE_DIR=$(switch_srcdir)/libs/$(FLITE)-release +FLITE_BUILDDIR=$(switch_builddir)/libs/$(FLITE)-release + +FLITE_LIBDIR=$(FLITE_BUILDDIR)/build/libs +FLITE_A=$(FLITE_LIBDIR)/libflite_cmu_us_awb.a \ + $(FLITE_LIBDIR)/libflite_cmu_us_kal.a \ + $(FLITE_LIBDIR)/libflite_cmu_us_kal16.a \ + $(FLITE_LIBDIR)/libflite_cmu_us_rms.a \ + $(FLITE_LIBDIR)/libflite_cmu_us_slt.a \ + $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm mod_LTLIBRARIES = mod_flite.la mod_flite_la_SOURCES = mod_flite.c -mod_flite_la_CFLAGS = $(AM_CFLAGS) $(FLITE_CFLAGS) -mod_flite_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(FLITE_LIBS) +mod_flite_la_CFLAGS = $(AM_CFLAGS) -I$(FLITE_DIR)/include -I$(FLITE_BUILDDIR)/include +mod_flite_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(FLITE_A) mod_flite_la_LDFLAGS = -avoid-version -module -no-undefined -shared -else -install: error -all: error -error: - $(error You must install libflite-dev to build mod_flite) -endif +BUILT_SOURCES= $(FLITE_A) + +$(FLITE_DIR): + $(GETLIB) $(FLITE)-release.tar.bz2 + +$(FLITE_BUILDDIR)/.stamp-configure: $(FLITE_DIR) + mkdir -p $(FLITE_BUILDDIR) + cd $(FLITE_BUILDDIR) && $(DEFAULT_VARS) $(FLITE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(FLITE_DIR) --with-audio=none --with-pic --disable-shared + test -f Makefile && touch $@ + +$(FLITE_A): $(FLITE_DIR) $(FLITE_BUILDDIR)/.stamp-configure + cd $(FLITE_BUILDDIR) && $(MAKE) -j1 + test -d $(FLITE_LIBDIR) || mkdir $(FLITE_LIBDIR) + TARGET_OS=`grep TARGET_OS $(FLITE_BUILDDIR)/config/config | sed "s/^.*= //"` ;\ + TARGET_CPU=`grep TARGET_CPU $(FLITE_BUILDDIR)/config/config | sed "s/^.*= //"` ;\ + cd $(FLITE_BUILDDIR) && cp build/$$TARGET_CPU-$$TARGET_OS/lib/*.a $(FLITE_LIBDIR) --- freeswitch-1.6.9/src/mod/codecs/mod_ilbc/Makefile.am 2016-06-13 20:17:45.000000000 +0000 +++ freeswitch-1.4.26/src/mod/codecs/mod_ilbc/Makefile.am 2016-01-12 01:08:16.000000000 +0000 @@ -1,17 +1,18 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_ilbc -if HAVE_ILBC +ILBC_DIR=$(switch_srcdir)/libs/ilbc +ILBC_BUILDDIR=$(switch_builddir)/libs/ilbc +ILBCLA=$(ILBC_BUILDDIR)/src/libilbc.la mod_LTLIBRARIES = mod_ilbc.la mod_ilbc_la_SOURCES = mod_ilbc.c -mod_ilbc_la_CFLAGS = $(AM_CFLAGS) $(ILBC_CFLAGS) -mod_ilbc_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(ILBC_LIBS) +mod_ilbc_la_CFLAGS = $(AM_CFLAGS) -I$(ILBC_DIR)/src -I$(ILBC_BUILDDIR)/src +mod_ilbc_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(ILBCLA) mod_ilbc_la_LDFLAGS = -avoid-version -module -no-undefined -shared -else -install: error -all: error -error: - $(error You must install libilbc-dev to build mod_ilbc) -endif +BUILT_SOURCES=$(ILBCLA) + +$(ILBCLA): $(ILBC_DIR) $(ILBC_DIR)/.update + cd $(ILBC_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) --- freeswitch-1.6.9/src/mod/applications/mod_mongo/Makefile.am 2016-06-13 20:17:45.000000000 +0000 +++ freeswitch-1.4.26/src/mod/applications/mod_mongo/Makefile.am 2016-01-12 01:08:16.000000000 +0000 @@ -3,19 +3,35 @@ AUTOMAKE_OPTIONS += foreign MODNAME=mod_mongo -if HAVE_MONGOC +MONGOC=mongo-c-driver-1.1.0 +MONGOC_DIR=$(switch_srcdir)/libs/$(MONGOC) +MONGOC_BUILDDIR=$(switch_builddir)/libs/$(MONGOC) +MONGOC_LA=$(MONGOC_BUILDDIR)/libmongoc-priv.la mod_LTLIBRARIES = mod_mongo.la mod_mongo_la_SOURCES = mod_mongo.c -mod_mongo_la_CFLAGS = $(AM_CFLAGS) $(MONGOC_CFLAGS) +mod_mongo_la_CFLAGS = $(AM_CFLAGS) -I$(MONGOC_DIR)/src/mongoc/ -I$(MONGOC_DIR)/src/libbson/src/bson/ mod_mongo_la_CPPFLAGS = $(AM_CPPFLAGS) -mod_mongo_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(MONGOC_LIBS) +mod_mongo_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(MONGOC_LA) mod_mongo_la_LDFLAGS = -avoid-version -module -no-undefined -shared +BUILT_SOURCES=$(MONGOC_LA) + +$(MONGOC_DIR)/configure: + $(GETLIB) $(MONGOC).tar.gz + sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/configure + sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/build/autotools/SetupLibtool.m4 + sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/src/libbson/configure + sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/src/libbson/build/autotools/SetupLibtool.m4 + cd $(MONGOC_DIR) && autoreconf -i + $(TOUCH_TARGET) + +$(MONGOC_BUILDDIR)/Makefile: $(MONGOC_DIR)/configure + mkdir -p $(MONGOC_BUILDDIR) + cd $(MONGOC_BUILDDIR) && $(DEFAULT_VARS) $(MONGOC_DIR)/configure $(DEFAULT_ARGS) + $(TOUCH_TARGET) + +$(MONGOC_LA): $(MONGOC_BUILDDIR)/Makefile + cd $(MONGOC_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) -else -install: error -all: error -error: - $(error You must install libmongoc-dev to build mod_mongo) -endif --- freeswitch-1.6.9/src/mod/codecs/mod_opus/Makefile.am 2016-06-13 20:17:45.000000000 +0000 +++ freeswitch-1.4.26/src/mod/codecs/mod_opus/Makefile.am 2016-01-12 01:08:16.000000000 +0000 @@ -1,17 +1,30 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_opus - -if HAVE_OPUS +OPUS=opus-1.1-p2 +OPUS_DIR=$(switch_srcdir)/libs/$(OPUS) +OPUS_BUILDDIR=$(switch_builddir)/libs/$(OPUS) +OPUS_LA=$(OPUS_BUILDDIR)/.libs/libopus.la mod_LTLIBRARIES = mod_opus.la mod_opus_la_SOURCES = mod_opus.c -mod_opus_la_CFLAGS = $(AM_CFLAGS) $(OPUS_CFLAGS) -mod_opus_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(OPUS_LIBS) +mod_opus_la_CFLAGS = $(AM_CFLAGS) -I$(OPUS_DIR)/include +mod_opus_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(OPUS_LA) mod_opus_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm -lz -else -install: error -all: error -error: - $(error You must install libopus-dev to build mod_opus) -endif +MY_DEFAULT_ARGS = --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-shared --with-pic --srcdir=$(OPUS_DIR) + +BUILT_SOURCES=$(OPUS_LA) +$(OPUS_DIR)/configure: + $(GETLIB) $(OPUS).tar.gz + +$(OPUS_BUILDDIR)/Makefile: $(OPUS_DIR)/configure + mkdir -p $(OPUS_BUILDDIR) + cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure $(MY_DEFAULT_ARGS) + $(TOUCH_TARGET) + +$(OPUS_LA): $(OPUS_BUILDDIR)/Makefile + cd $(OPUS_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) + +$(MODNAME).lo: $(OPUS_LA) + --- freeswitch-1.6.9/src/mod/formats/mod_shout/mod_shout.c~ 2016-06-13 20:17:46.000000000 +0000 +++ freeswitch-1.6.9/src/mod/formats/mod_shout/mod_shout.c 2016-06-19 17:45:06.938520455 +0000 @@ -35,11 +35,7 @@ #include <switch.h> -#include "mpg123.h" +#include "libmpg123/mpg123.h" #include <shout/shout.h> -#ifdef WIN32 #include <lame.h> -#else -#include <lame/lame.h> -#endif #include <switch_curl.h> #define OUTSCALE 8192 * 2 --- freeswitch-1.6.9/src/mod/formats/mod_shout/Makefile.am 2016-06-13 20:17:46.000000000 +0000 +++ freeswitch-1.4.26/src/mod/formats/mod_shout/Makefile.am 2016-01-12 01:08:16.000000000 +0000 @@ -1,35 +1,65 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_shout -if HAVE_SHOUT -if HAVE_MPG123 -if HAVE_MP3LAME +LAME=lame-3.98.4 +SHOUT=libshout-2.2.2 +MPG123=mpg123-1.13.2 + +LAME_DIR=$(switch_srcdir)/libs/$(LAME) +SHOUT_DIR=$(switch_srcdir)/libs/$(SHOUT) +MPG123_DIR=$(switch_srcdir)/libs/$(MPG123) + +LAME_BUILDDIR=$(switch_builddir)/libs/$(LAME) +SHOUT_BUILDDIR=$(switch_builddir)/libs/$(SHOUT) +MPG123_BUILDDIR=$(switch_builddir)/libs/$(MPG123) + +LAMELA=$(LAME_BUILDDIR)/libmp3lame/libmp3lame.la +SHOUTLA=$(SHOUT_BUILDDIR)/src/libshout.la +MPG123LA=$(MPG123_BUILDDIR)/src/libmpg123/libmpg123.la mod_LTLIBRARIES = mod_shout.la mod_shout_la_SOURCES = mod_shout.c mod_shout_la_CFLAGS = $(AM_CFLAGS) -mod_shout_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) $(SHOUT_CFLAGS) $(MP3LAME_CFLAGS) $(MPG123_CFLAGS) -mod_shout_la_LIBADD = $(switch_builddir)/libfreeswitch.la -mod_shout_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared $(SHOUT_LIBS) $(MP3LAME_LIBS) $(MPG123_LIBS) - -else -install: error -all: error -error: - $(error You must install libmp3lame-dev to build mod_shout) -endif - -else -install: error -all: error -error: - $(error You must install libmpg123-dev to build mod_shout) -endif - -else -install: error -all: error -error: - $(error You must install libshout3-dev to build mod_shout) -endif +mod_shout_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) -I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src -I$(MPG123_BUILDDIR)/src -I$(SHOUT_BUILDDIR)/include +mod_shout_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LAMELA) $(SHOUTLA) $(MPG123LA) +mod_shout_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared `cat $(SHOUT_BUILDDIR)/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` `cat $(SHOUTLA) | grep dependency_libs | sed -e 's|^dependency_libs=||' | sed -e "s|'||g"` + +BUILT_SOURCES=$(LAMELA) $(SHOUTLA) $(MPG123LA) + +$(MPG123_DIR): + $(GETLIB) $(MPG123).tar.gz + +$(MPG123_BUILDDIR)/Makefile: $(MPG123_DIR) + mkdir -p $(MPG123_BUILDDIR) + cd $(MPG123_BUILDDIR) && $(DEFAULT_VARS) $(MPG123_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --srcdir=$(MPG123_DIR) CPPFLAGS= LDFLAGS= + $(TOUCH_TARGET) + +$(MPG123LA): $(MPG123_BUILDDIR)/Makefile + cd $(MPG123_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) + +$(LAME_DIR): + $(GETLIB) $(LAME).tar.gz + +$(LAME_BUILDDIR)/Makefile: $(LAME_DIR) + mkdir -p $(LAME_BUILDDIR) + cd $(LAME_BUILDDIR) && $(DEFAULT_VARS) $(LAME_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --disable-decoder --srcdir=$(LAME_DIR) CPPFLAGS= LDFLAGS= + $(TOUCH_TARGET) + +$(LAMELA): $(LAME_BUILDDIR)/Makefile + cd $(LAME_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) + +$(SHOUT_DIR): + $(GETLIB) $(SHOUT).tar.gz + patch -p 6 -d $(switch_srcdir)/libs/libshout-2.2.2 < $(switch_srcdir)/src/mod/formats/mod_shout/hack_out_ogg.diff + +$(SHOUT_BUILDDIR)/Makefile: $(SHOUT_DIR) + mkdir -p $(SHOUT_BUILDDIR) + cd $(SHOUT_BUILDDIR) && $(DEFAULT_VARS) $(SHOUT_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --srcdir=$(SHOUT_DIR) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS= + $(TOUCH_TARGET) + +$(SHOUTLA): $(SHOUT_BUILDDIR)/Makefile + cd $(SHOUT_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) --- freeswitch-1.6.9/src/mod/codecs/mod_silk/Makefile.am 2016-06-13 20:17:45.000000000 +0000 +++ freeswitch-1.4.26/src/mod/codecs/mod_silk/Makefile.am 2016-01-12 01:08:16.000000000 +0000 @@ -1,17 +1,19 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_silk -if HAVE_SILK +SILK_DIR=$(switch_srcdir)/libs/silk +SILK_BUILDDIR=$(switch_builddir)/libs/silk +SILK_LA=$(SILK_BUILDDIR)/.libs/libSKP_SILK_SDK.la mod_LTLIBRARIES = mod_silk.la mod_silk_la_SOURCES = mod_silk.c -mod_silk_la_CFLAGS = $(AM_CFLAGS) $(SILK_CFLAGS) -mod_silk_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SILK_LIBS) +mod_silk_la_CFLAGS = $(AM_CFLAGS) -I$(SILK_DIR)/src -I$(SILK_DIR)/interface +mod_silk_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SILK_LA) mod_silk_la_LDFLAGS = -avoid-version -module -no-undefined -shared -else -install: error -all: error -error: - $(error You must install libsilk-dev to build mod_silk) -endif +BUILT_SOURCES=$(SILK_LA) + +$(SILK_LA): $(SILK_DIR)/.update + mkdir -p $(SILK_BUILDDIR) + cd $(SILK_BUILDDIR) && $(DEFAULT_VARS) $(SILK_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SILK_DIR) --disable-shared && $(MAKE) clean && $(MAKE) + $(TOUCH_TARGET) --- freeswitch-1.6.9/src/mod/codecs/mod_siren/Makefile.am 2016-06-13 20:17:45.000000000 +0000 +++ freeswitch-1.4.26/src/mod/codecs/mod_siren/Makefile.am 2016-01-12 01:08:16.000000000 +0000 @@ -1,17 +1,16 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_siren - -if HAVE_G7221 - +G722_1_DIR=$(switch_srcdir)/libs/libg722_1 +G722_1_BUILDDIR=$(switch_builddir)/libs/libg722_1 +G722_1_LA=$(G722_1_BUILDDIR)/src/.libs/libg722_1.la mod_LTLIBRARIES = mod_siren.la mod_siren_la_SOURCES = mod_siren.c -mod_siren_la_CFLAGS = $(AM_CFLAGS) $(G7221_CFLAGS) -mod_siren_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(G7221_LIBS) +mod_siren_la_CFLAGS = $(AM_CFLAGS) -I$(G722_1_DIR)/src -I$(G722_1_BUILDDIR)/src +mod_siren_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(G722_1_LA) mod_siren_la_LDFLAGS = -avoid-version -module -no-undefined -shared -else -install: error -all: error -error: - $(error You must install libg7221-dev to build mod_siren) -endif +BUILT_SOURCES=$(G722_1_LA) + +$(G722_1_LA): $(G722_1_DIR)/.update + cd $(G722_1_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) --- freeswitch-1.6.9_orig/rebootstrap.sh 2016-06-13 20:17:46.000000000 +0000 +++ freeswitch-1.6.9/rebootstrap.sh 2016-06-19 14:45:54.796603094 +0000 @@ -8,7 +8,7 @@ VERBOSE=false BASEDIR=`pwd`; LIBDIR=${BASEDIR}/libs; -SUBDIRS="apr libzrtp iksemel libdingaling sofia-sip srtp freetdm spandsp unimrcp tiff-4.0.2 fs"; +SUBDIRS="apr libzrtp ilbc iksemel libdingaling sofia-sip srtp freetdm spandsp libg722_1 unimrcp tiff-4.0.2 broadvoice silk libcodec2 fs"; while getopts 'jhd:v' o; do case "$o" in
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor