main/freeswitch: enable and upgrade to 1.4.6

4 files changed, 65 insertions, 57 deletions

diff --git a/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch b/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch
index c83cfd58b..5a3f3551e 100644
--- a/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch
+++ b/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch
@@ -1,37 +1,23 @@
-From ab10000fddd6735ff986d3b0f8092bc733bf5267 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 10 Jun 2011 13:06:35 +0300
-Subject: [PATCH 2/2] mod_lua: alpine module search path
-
----
- src/mod/languages/mod_lua/lua/luaconf.h |    9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/mod/languages/mod_lua/lua/luaconf.h b/src/mod/languages/mod_lua/lua/luaconf.h
-index ca2849b..bc8c17b 100644
---- a/src/mod/languages/mod_lua/lua/luaconf.h
+--- a/src/mod/languages/mod_lua/lua/luaconf.h.orig
 +++ b/src/mod/languages/mod_lua/lua/luaconf.h
-@@ -95,13 +95,18 @@
+@@ -101,13 +101,18 @@
  
- #else
+ #define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
  #define LUA_ROOT	"/usr/local/"
 +#define LUA_ROOT2	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
-+#define LUA_LDIR2	LUA_ROOT2 "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
-+#define LUA_CDIR2	LUA_ROOT2 "lib/lua/5.1/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR
++#define LUA_LDIR2	LUA_ROOT2 "share/lua/" LUA_VDIR
+ #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR
++#define LUA_CDIR2	LUA_ROOT2 "lib/lua/" LUA_VDIR
  #define LUA_PATH_DEFAULT  \
- 		"./?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
--		            LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
-+		            LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
-+		            LUA_LDIR2"?.lua;"  LUA_LDIR2"?/init.lua"
+ 		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+-		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" "./?.lua"
++		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" "./?.lua" \
++		LUA_LDIR2"?.lua;"  LUA_LDIR2"?/init.lua"
  #define LUA_CPATH_DEFAULT \
--	"./?.so;"  "./lib?51.so;"  LUA_CDIR"?.so;" LUA_CDIR"lib?51.so;" LUA_CDIR"loadall.so"
-+	"./?.so;" LUA_CDIR"?.so;" LUA_CDIR2"?.so;" LUA_CDIR"loadall.so"
-+
- #endif
+-		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
++		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so" \
++		LUA_CDIR2"?.so;"
+ #endif			/* } */
  
  
--- 
-1.7.1
-
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index fc9ad1fb5..e49710c82 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -2,11 +2,11 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Contributor: Cameron Banta <cbanta@gmail.com>
 pkgname=freeswitch
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.6
+pkgrel=0
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
-arch=""
+arch="all"
 license="GPL"
 depends=""
 pkgusers="freeswitch"
@@ -15,7 +15,8 @@ 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"
+	libjpeg-turbo-dev sngtc_client-dev gnutls-dev util-linux-dev
+	sqlite-dev pcre-dev speex-dev ldns-dev libedit-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-dev $pkgname-flite $pkgname-timezones
 	$pkgname-sample-config:conf $pkgname-freetdm $pkgname-sangoma
@@ -34,14 +35,15 @@ _libsources="
 	freeswitch-$_mpg123::http://files.freeswitch.org/downloads/libs/$_mpg123
 	"
 
-source="http://files.freeswitch.org/$pkgname-$pkgver.latest.tar.bz2
+source="http://files.freeswitch.org/$pkgname-$pkgver.tar.xz
 	$_libsources
 	getlib.patch
-	freeswitch-mod_shout-textrels.patch
-	0002-mod_lua-alpine-module-search-path.patch
 	modules.conf
 	freeswitch.confd
 	freeswitch.initd
+	libshout-disable-examples.patch
+	0002-mod_lua-alpine-module-search-path.patch
+	freeswitch-mod_shout-textrels.patch
 	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -55,7 +57,8 @@ prepare() {
 	cd "$_builddir"
 	for i in $source; do
 		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		libshout-disable-examples.patch) msg $i; cd "$srcdir"; patch -p0 -i "$srcdir"/$i || return 1;;
+		*.patch) msg $i; cd "$_builddir"; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
 	cd "$srcdir"
@@ -71,9 +74,6 @@ build() {
 
 	cp -f "$srcdir/modules.conf" modules.conf || return 1
 
-	# remove -Werror since gcc-4.5 is more strict
-	sed -i -e 's/-Werror//g' configure || return 1
-	[ "$ALPINE_LIBC" != "eglibc" ] && export LDFLAGS="$LDFLAGS -liconv"
 	CFLAGS="-Wno-unused-but-set-variable" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -189,39 +189,42 @@ conf() {
 	mkdir -p "$pkgdir"/etc/freeswitch/scripts
 }
 
-md5sums="fe7156cad3b37479de8da236a2d3653a  freeswitch-1.4.0.latest.tar.bz2
+md5sums="0c5d130f990d61812503510e08c21e59  freeswitch-1.4.6.tar.xz
 4653b3b9c568bb9c782178abfaac128d  freeswitch-json-c-0.9.tar.gz
 f3a2d88b1059f6f4ff3c20a8169bc0f4  freeswitch-flite-1.5.4-current.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
 1e7f335ee00f589825ecc9affa779346  getlib.patch
-e3912aa52a4d8f8cb3b4e38c2668116d  freeswitch-mod_shout-textrels.patch
-769eaa127d4dbae687dc4aa961a8cc70  0002-mod_lua-alpine-module-search-path.patch
 0eb382f73ed393f28b8a797ebbfa608b  modules.conf
 c608cca8ad773acebf201f581438c7e7  freeswitch.confd
-b48a5dbaa455bbe0bba4880cc06e6ff8  freeswitch.initd"
-sha256sums="e08731d5d30e3ddde5b1d7030636c4e0d6a121f318aecf9a88274d4b6cefd75e  freeswitch-1.4.0.latest.tar.bz2
+b48a5dbaa455bbe0bba4880cc06e6ff8  freeswitch.initd
+90b133b14a42c86d53d5e54dcbfbaf58  libshout-disable-examples.patch
+448ce737698753ec23283cb11725a62b  0002-mod_lua-alpine-module-search-path.patch
+4cd4923463c89bed053e6295b5a4ec40  freeswitch-mod_shout-textrels.patch"
+sha256sums="dcb489241dcbe54a80619565123545cc28bd44039684ce9dc5cb93108618732a  freeswitch-1.4.6.tar.xz
 816fb2d4baab09e2f51a7c1be75bc9e03ed09d4cf3c2cd03c183f433bb9b565f  freeswitch-json-c-0.9.tar.gz
 e98c54307954f406ef59a354f9ec274436b95be53f785e27191f19569af0ed7e  freeswitch-flite-1.5.4-current.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
 ab437c92149b6fc88bc2fc8a228d6a5f8af574e2c90469a6dc4c753d13972c34  getlib.patch
-ecb80df356c1a5e825eeff7327f15e6a5dd745610d6224d3785f851c30b99f15  freeswitch-mod_shout-textrels.patch
-ec1eb0cc516533893d56afe8ad95e7f2c886522540b7b443c6d60a05207ed081  0002-mod_lua-alpine-module-search-path.patch
 f83f9680d243eb254bf045571f971a6c5cf716367444cd48ed26d4c3367f4c41  modules.conf
 846a29a361ef6eecd77876963b5c0133699c40fa8b34c68df42d5f8a1a1915b1  freeswitch.confd
-4c3d4db15afe51c6a29f13fded2821e3390dc21953fa7f9bcb238626a40d8037  freeswitch.initd"
-sha512sums="34b8038f9b42ed1b035a57c2057f34d78da31cc9ab38792fd5d7dad7eb8e1ebbca924cd487643714c4b25a1e126fe5d65147af948769e529c4f1640d90e3a490  freeswitch-1.4.0.latest.tar.bz2
+4c3d4db15afe51c6a29f13fded2821e3390dc21953fa7f9bcb238626a40d8037  freeswitch.initd
+db0d3c252b5664ecb071bcf6868eff77c85dd7943a63fcfcac7e19db6a0ff61f  libshout-disable-examples.patch
+0f867ea9bc20766728968523da7aac21b1def34d3f825db26d89fbc93c11d2ca  0002-mod_lua-alpine-module-search-path.patch
+be1009327de615f04956ba0b0f44183f31c263e380af8027f94b976a84bcb09a  freeswitch-mod_shout-textrels.patch"
+sha512sums="466eab73fd006052ba40019cca8c03502475c059844b709b3bb179a5e020793fe5cd1ec41d48aa3c263c8297fc61367ccb65b2b6f8bb4f73d7d09f04e6e1da6d  freeswitch-1.4.6.tar.xz
 38b8729275bbfebaee783e703d19481f3d32b50cfdeb338644b8db2742573ea025702c789b5ce8d5067dcde23c5a16b46231eaadf0b9c5dbff392d410912c772  freeswitch-json-c-0.9.tar.gz
 e239e5730d7cbbae8a2985445e49156ffc92489d9fac655d0a9db617ac63c2fc522e4c086a6afced26daa383c269c546ff7e62227ae8bdc998024a85991fb55d  freeswitch-flite-1.5.4-current.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
 4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4  getlib.patch
-082ee8e5daec0b2bbdd125f1a9270a77f244fb5b27ca816959311602acc0f68ed82bb568d7545b1da90b7a67ec444738ac70cc2a262b30d74ff5b985a0ce43ea  freeswitch-mod_shout-textrels.patch
-61574226372574066d7a005f68dd90ad59af7950ec689c0899affc0afcde0d7801e6b0d571af0f2911d9f2953c8b87d2473170cbea9a527f23134a33721c78b6  0002-mod_lua-alpine-module-search-path.patch
 6330e47cd3dcfdb4f5c99e91c9c725c7c8aa4f1691d83817d7600e510b5a586f3312bab84df3766448bbdab78cd1feebecf64b8280626b3f751f6e787f145e23  modules.conf
 a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd328436c8e0242cbd664170b80754ea2846021689baf1f1595  freeswitch.confd
-7792217db47a8f0d3d89a9c27090b9feefa8fd6e6b6651fa960be733fba9a22ac0e46f65fd6c24e489791bc0e4f42f1c5b89271541d024f1bbd593bb3b89666f  freeswitch.initd"
+7792217db47a8f0d3d89a9c27090b9feefa8fd6e6b6651fa960be733fba9a22ac0e46f65fd6c24e489791bc0e4f42f1c5b89271541d024f1bbd593bb3b89666f  freeswitch.initd
+91a6d7c8456de65855930b371f568f0230c28422e667453aa48fababd185b47677c06ff0c79f94c2a02182439b012d48cb54548cbde3d12b8d0e1ffbb9b229cc  libshout-disable-examples.patch
+65c3d1fb08824fbdec3d9d3b332007a7847463bba272d9ba2df23ac218a2ede84eeb5a77a1a667c3dd370fe406bd2ebf8687d198a01519f4a09168418fbf39bc  0002-mod_lua-alpine-module-search-path.patch
+5f085254ca9f5dc196afd39fc55e083b1998e776d9de2428e5657d99077526c33c1fc13f12432598184ce63138447fed7c318c384b743681703f5682dc8e1e50  freeswitch-mod_shout-textrels.patch"
diff --git a/main/freeswitch/freeswitch-mod_shout-textrels.patch b/main/freeswitch/freeswitch-mod_shout-textrels.patch
index 06e561103..368245a01 100644
--- a/main/freeswitch/freeswitch-mod_shout-textrels.patch
+++ b/main/freeswitch/freeswitch-mod_shout-textrels.patch
@@ -1,11 +1,11 @@
---- ./src/mod/formats/mod_shout/Makefile.orig
-+++ ./src/mod/formats/mod_shout/Makefile
-@@ -28,7 +28,7 @@
+--- a/src/mod/formats/mod_shout/Makefile.in.orig
++++ b/src/mod/formats/mod_shout/Makefile.in
+@@ -772,7 +772,7 @@
  
  $(MPG123_BUILDDIR)/Makefile: $(MPG123_DIR)
  	mkdir -p $(MPG123_BUILDDIR)
--	cd $(MPG123_BUILDDIR) && $(DEFAULT_VARS) $(MPG123_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(MPG123_DIR) CPPFLAGS= LDFLAGS=
-+	cd $(MPG123_BUILDDIR) && $(DEFAULT_VARS) $(MPG123_DIR)/configure $(DEFAULT_ARGS) --with-cpu=i386_fpu --srcdir=$(MPG123_DIR) CPPFLAGS= LDFLAGS=
+-	cd $(MPG123_BUILDDIR) && $(DEFAULT_VARS) $(MPG123_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --srcdir=$(MPG123_DIR) CPPFLAGS= LDFLAGS=
++	cd $(MPG123_BUILDDIR) && $(DEFAULT_VARS) $(MPG123_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-cpu=i386_fpu --with-pic --srcdir=$(MPG123_DIR) CPPFLAGS= LDFLAGS=
  	$(TOUCH_TARGET)
  
  $(MPG123LA): $(MPG123_BUILDDIR)/Makefile
diff --git a/main/freeswitch/libshout-disable-examples.patch b/main/freeswitch/libshout-disable-examples.patch
new file mode 100644
index 000000000..121de3555
--- /dev/null
+++ b/main/freeswitch/libshout-disable-examples.patch
@@ -0,0 +1,19 @@
+--- libshout-2.2.2/Makefile.in
++++ libshout-2.2.2/Makefile.in
+@@ -246,14 +246,14 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = 1.6 foreign
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = include src examples debian doc win32
++SUBDIRS = include src debian doc win32
+ EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \
+ 	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
+ 	m4/xiph_types.m4
+ 
+ DISTCLEANFILES = shout-config.in
+ docdir = $(datadir)/doc/$(PACKAGE)
+-doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c
++doc_DATA = COPYING NEWS README 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = m4/shout.m4
+ @HAVE_PKGCONFIG_TRUE@pkgconfigdir = $(libdir)/pkgconfig