main/freeswitch: upgrade to 1.4.18

2 files changed, 42 insertions, 66 deletions

diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 75d84dbdee..47e2868d33 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Contributor: Cameron Banta <cbanta@gmail.com>
 pkgname=freeswitch
-pkgver=1.4.13
+pkgver=1.4.18
 pkgrel=0
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
@@ -12,19 +12,43 @@ depends=""
 pkgusers="freeswitch"
 options="!configsub"
 pkggroups="freeswitch"
-makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev ncurses-dev
-	autoconf automake libtool libpri-dev bash net-snmp-dev postgresql-dev
-	libiconv-dev subversion flac-dev libogg-dev libvorbis-dev
-	libjpeg-turbo-dev sngtc_client-dev gnutls-dev util-linux-dev
-	sqlite-dev pcre-dev speex-dev ldns-dev libedit-dev lua5.2-dev
-	portaudio-dev"
+makedepends="bash
+	bsd-compat-headers
+	curl-dev
+	flac-dev
+	gnutls-dev
+	ldns-dev
+	libedit-dev
+	libiconv-dev
+	libjpeg-turbo-dev
+	libogg-dev
+	libpri-dev
+	libvorbis-dev
+	linux-headers
+	lua5.2-dev
+	ncurses-dev
+	net-snmp-dev
+	openssl-dev
+	pcre-dev
+	portaudio-dev
+	postgresql-dev
+	sngtc_client-dev
+	speex-dev
+	speexdsp-dev
+	sqlite-dev
+	unixodbc-dev
+	util-linux-dev
+	zlib-dev
+
+	autoconf automake libtool
+	"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-dev $pkgname-flite $pkgname-timezones
 	$pkgname-sample-config:conf $pkgname-freetdm $pkgname-sangoma
 	$pkgname-snmp $pkgname-pgsql"
 
 _json_c="json-c-0.9.tar.gz"
-_flite="flite-1.5.4-current.tar.bz2"
+_flite="flite-2.0.0-release.tar.bz2"
 _lame="lame-3.98.4.tar.gz"
 _libshout="libshout-2.2.2.tar.gz"
 _mpg123="mpg123-1.13.2.tar.gz"
@@ -44,7 +68,6 @@ source="http://files.freeswitch.org/$pkgname-$pkgver.tar.xz
 	freeswitch.initd
 	libshout-disable-examples.patch
 	freeswitch-mod_shout-textrels.patch
-	system-lua.patch
 	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -91,6 +114,7 @@ build() {
 		--with-libpri \
 		--disable-debug \
 		--enable-core-pgsql-support \
+		--enable-system-lua \
 		|| return 1
 
 	# first build libfreeswitch (in parallel)
@@ -193,9 +217,9 @@ conf() {
 	mkdir -p "$pkgdir"/etc/freeswitch/scripts
 }
 
-md5sums="3a5a6cf6b6508355a012541c64f648d9  freeswitch-1.4.13.tar.xz
+md5sums="a6044a3fcefc8f76cc2bfcab3abc9d58  freeswitch-1.4.18.tar.xz
 4653b3b9c568bb9c782178abfaac128d  freeswitch-json-c-0.9.tar.gz
-f3a2d88b1059f6f4ff3c20a8169bc0f4  freeswitch-flite-1.5.4-current.tar.bz2
+645db96ffc296cbb6d37f231cc1cc6b2  freeswitch-flite-2.0.0-release.tar.bz2
 8e9866ad6b570c6c95c8cba48060473f  freeswitch-lame-3.98.4.tar.gz
 e409b006b5dad6d8668c3e429bf20159  freeswitch-libshout-2.2.2.tar.gz
 452fd875cb5e4d16f77c757371836fff  freeswitch-mpg123-1.13.2.tar.gz
@@ -204,11 +228,10 @@ e409b006b5dad6d8668c3e429bf20159  freeswitch-libshout-2.2.2.tar.gz
 c608cca8ad773acebf201f581438c7e7  freeswitch.confd
 b48a5dbaa455bbe0bba4880cc06e6ff8  freeswitch.initd
 90b133b14a42c86d53d5e54dcbfbaf58  libshout-disable-examples.patch
-4cd4923463c89bed053e6295b5a4ec40  freeswitch-mod_shout-textrels.patch
-e792dc1e6858029ae8b27c00b5710a3c  system-lua.patch"
-sha256sums="ee0c38b11164245641ccdfcbb44fdf429bc1e7d69c1783f2238ea91118236c6c  freeswitch-1.4.13.tar.xz
+4cd4923463c89bed053e6295b5a4ec40  freeswitch-mod_shout-textrels.patch"
+sha256sums="54b3560d3c9b228a329677099beba40345af7592d19922212ee1a6c599ecbe4b  freeswitch-1.4.18.tar.xz
 816fb2d4baab09e2f51a7c1be75bc9e03ed09d4cf3c2cd03c183f433bb9b565f  freeswitch-json-c-0.9.tar.gz
-e98c54307954f406ef59a354f9ec274436b95be53f785e27191f19569af0ed7e  freeswitch-flite-1.5.4-current.tar.bz2
+678c3860fd539402b5d1699b921239072af6acb4e72dc4720494112807cae411  freeswitch-flite-2.0.0-release.tar.bz2
 ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8  freeswitch-lame-3.98.4.tar.gz
 38701125cb0e0349f4394dd3254d6037eeb8af0747c0942ff433ffbcd48d2367  freeswitch-libshout-2.2.2.tar.gz
 b3a855acc96e0061a0c2b1162e8aff80b6b1a03849e3756786db2fcacfc9a9bd  freeswitch-mpg123-1.13.2.tar.gz
@@ -217,11 +240,10 @@ f83f9680d243eb254bf045571f971a6c5cf716367444cd48ed26d4c3367f4c41  modules.conf
 846a29a361ef6eecd77876963b5c0133699c40fa8b34c68df42d5f8a1a1915b1  freeswitch.confd
 4c3d4db15afe51c6a29f13fded2821e3390dc21953fa7f9bcb238626a40d8037  freeswitch.initd
 db0d3c252b5664ecb071bcf6868eff77c85dd7943a63fcfcac7e19db6a0ff61f  libshout-disable-examples.patch
-be1009327de615f04956ba0b0f44183f31c263e380af8027f94b976a84bcb09a  freeswitch-mod_shout-textrels.patch
-2d4c0afc75c34aa47785bfd4759096c26cf5dd95b3b14c8e9c6d96a108747116  system-lua.patch"
-sha512sums="dc36a41770f73d53876cd52ca0b2de2da913589a8c8a0e564766084c3b14cef40bf861a701a8e880c547280b4a189dbcd415ebd9a381ac0099ece9d67d8c9aa4  freeswitch-1.4.13.tar.xz
+be1009327de615f04956ba0b0f44183f31c263e380af8027f94b976a84bcb09a  freeswitch-mod_shout-textrels.patch"
+sha512sums="9de4d86c9adfde9f30e84ab6900ec115c2441126904c7f4f705767bced25ec166fb386cd2fde7f9a1eeadfea61aede0f02f9e0fcb508c92974c75b887633b5a4  freeswitch-1.4.18.tar.xz
 38b8729275bbfebaee783e703d19481f3d32b50cfdeb338644b8db2742573ea025702c789b5ce8d5067dcde23c5a16b46231eaadf0b9c5dbff392d410912c772  freeswitch-json-c-0.9.tar.gz
-e239e5730d7cbbae8a2985445e49156ffc92489d9fac655d0a9db617ac63c2fc522e4c086a6afced26daa383c269c546ff7e62227ae8bdc998024a85991fb55d  freeswitch-flite-1.5.4-current.tar.bz2
+e2b353721d0316fbd7948f90f9c9561d080eebd50e8dd0449a9c803ffbdb060a469385fadd63f535ade8d627cba37928d8e72ac61d5bcf98f73ca5ebb66549f8  freeswitch-flite-2.0.0-release.tar.bz2
 cf6cff914c06c2d65470c577eed2bfa226e9017cdfd26aa3e95c3b3b76c40568151ca223327859d6dacb982c80c06b672ba4e9f32ce1e452363c95126edb301b  freeswitch-lame-3.98.4.tar.gz
 d517d1d6a79dfd4819c42603faafc051c69270831f4894c01f6bd38e877eb008f8458534857641fd8d653fd437fb41ee1c558ff2a76339c3a8a579f4d5a26baf  freeswitch-libshout-2.2.2.tar.gz
 1940b6bf1c7167a7718ac0972e9c8cf9a49cf8c7a4a062052d00ead282cf4ae63214bfc317f2ccb424f6f3f26c602e91300d45635ba2d4f8da992c94b3ed0885  freeswitch-mpg123-1.13.2.tar.gz
@@ -230,5 +252,4 @@ d517d1d6a79dfd4819c42603faafc051c69270831f4894c01f6bd38e877eb008f8458534857641fd
 a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd328436c8e0242cbd664170b80754ea2846021689baf1f1595  freeswitch.confd
 7792217db47a8f0d3d89a9c27090b9feefa8fd6e6b6651fa960be733fba9a22ac0e46f65fd6c24e489791bc0e4f42f1c5b89271541d024f1bbd593bb3b89666f  freeswitch.initd
 91a6d7c8456de65855930b371f568f0230c28422e667453aa48fababd185b47677c06ff0c79f94c2a02182439b012d48cb54548cbde3d12b8d0e1ffbb9b229cc  libshout-disable-examples.patch
-5f085254ca9f5dc196afd39fc55e083b1998e776d9de2428e5657d99077526c33c1fc13f12432598184ce63138447fed7c318c384b743681703f5682dc8e1e50  freeswitch-mod_shout-textrels.patch
-bb60ecfa16c5d6e084f741e1a9ced59d94b7f6eb132127434aeef384fb95bc1896212aac33d0d8ffcd68dc9d99054d88691dc5d5c970f66d631b40dff766e4e4  system-lua.patch"
+5f085254ca9f5dc196afd39fc55e083b1998e776d9de2428e5657d99077526c33c1fc13f12432598184ce63138447fed7c318c384b743681703f5682dc8e1e50  freeswitch-mod_shout-textrels.patch"
diff --git a/main/freeswitch/system-lua.patch b/main/freeswitch/system-lua.patch
deleted file mode 100644
index deb52ea473..0000000000
--- a/main/freeswitch/system-lua.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- ./src/mod/languages/mod_lua/Makefile.in.orig
-+++ ./src/mod/languages/mod_lua/Makefile.in
-@@ -90,23 +90,7 @@
- mod_lua_la_DEPENDENCIES = $(switch_builddir)/libfreeswitch.la
- am__dirstamp = $(am__leading_dot)dirstamp
- am_mod_lua_la_OBJECTS = mod_lua_la-mod_lua.lo \
--	mod_lua_la-freeswitch_lua.lo mod_lua_la-mod_lua_wrap.lo \
--	lua/mod_lua_la-lapi.lo lua/mod_lua_la-lcode.lo \
--	lua/mod_lua_la-lctype.lo lua/mod_lua_la-ldebug.lo \
--	lua/mod_lua_la-ldo.lo lua/mod_lua_la-ldump.lo \
--	lua/mod_lua_la-lfunc.lo lua/mod_lua_la-lgc.lo \
--	lua/mod_lua_la-llex.lo lua/mod_lua_la-lmem.lo \
--	lua/mod_lua_la-lobject.lo lua/mod_lua_la-lopcodes.lo \
--	lua/mod_lua_la-lparser.lo lua/mod_lua_la-lstate.lo \
--	lua/mod_lua_la-lstring.lo lua/mod_lua_la-ltable.lo \
--	lua/mod_lua_la-ltm.lo lua/mod_lua_la-lundump.lo \
--	lua/mod_lua_la-lvm.lo lua/mod_lua_la-lzio.lo \
--	lua/mod_lua_la-lauxlib.lo lua/mod_lua_la-lbaselib.lo \
--	lua/mod_lua_la-lbitlib.lo lua/mod_lua_la-lcorolib.lo \
--	lua/mod_lua_la-ldblib.lo lua/mod_lua_la-liolib.lo \
--	lua/mod_lua_la-lmathlib.lo lua/mod_lua_la-loslib.lo \
--	lua/mod_lua_la-lstrlib.lo lua/mod_lua_la-ltablib.lo \
--	lua/mod_lua_la-loadlib.lo lua/mod_lua_la-linit.lo
-+	mod_lua_la-freeswitch_lua.lo mod_lua_la-mod_lua_wrap.lo
- mod_lua_la_OBJECTS = $(am_mod_lua_la_OBJECTS)
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -420,11 +404,13 @@
- MODNAME = mod_lua
- LUA_DIR = $(switch_srcdir)/src/mod/languages/mod_lua/lua
- LIBLUA_A = $(LUA_DIR)/liblua.a
-+LUA_CFLAGS := $(shell pkg-config --cflags lua5.2)
-+LUA_LIBS := $(shell pkg-config --libs lua5.2)
- mod_LTLIBRARIES = mod_lua.la
--mod_lua_la_SOURCES = mod_lua.cpp freeswitch_lua.cpp mod_lua_wrap.cpp lua/lapi.c lua/lcode.c lua/lctype.c lua/ldebug.c lua/ldo.c lua/ldump.c lua/lfunc.c lua/lgc.c lua/llex.c lua/lmem.c lua/lobject.c lua/lopcodes.c lua/lparser.c lua/lstate.c lua/lstring.c lua/ltable.c lua/ltm.c lua/lundump.c lua/lvm.c lua/lzio.c lua/lauxlib.c lua/lbaselib.c lua/lbitlib.c lua/lcorolib.c lua/ldblib.c lua/liolib.c lua/lmathlib.c lua/loslib.c lua/lstrlib.c lua/ltablib.c lua/loadlib.c lua/linit.c
--mod_lua_la_CXXFLAGS = -I$(LUA_DIR) $(AM_CPPFLAGS) -DLUA_USE_LINUX
--mod_lua_la_CFLAGS = -I$(LUA_DIR) $(AM_CPPFLAGS) -DLUA_USE_LINUX
--mod_lua_la_LIBADD = $(switch_builddir)/libfreeswitch.la 
-+mod_lua_la_SOURCES = mod_lua.cpp freeswitch_lua.cpp mod_lua_wrap.cpp
-+mod_lua_la_CXXFLAGS = $(AM_CPPFLAGS) $(LUA_CFLAGS)
-+mod_lua_la_CFLAGS = $(AM_CPPFLAGS) $(LUA_CFLAGS)
-+mod_lua_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LUA_LIBS)
- mod_lua_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm $(AM_LDFLAGS) $(SOLINK) #$(LIBLUA_A)
- all: all-am
-