main/freeswitch: use system liblua instead of embedded

2 files changed, 43 insertions, 5 deletions

diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index e49710c82..1c9f89109 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Cameron Banta <cbanta@gmail.com>
 pkgname=freeswitch
 pkgver=1.4.6
-pkgrel=0
+pkgrel=1
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
 arch="all"
@@ -16,7 +16,7 @@ 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"
+	sqlite-dev pcre-dev speex-dev ldns-dev libedit-dev lua5.2-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-dev $pkgname-flite $pkgname-timezones
 	$pkgname-sample-config:conf $pkgname-freetdm $pkgname-sangoma
@@ -44,6 +44,7 @@ source="http://files.freeswitch.org/$pkgname-$pkgver.tar.xz
 	libshout-disable-examples.patch
 	0002-mod_lua-alpine-module-search-path.patch
 	freeswitch-mod_shout-textrels.patch
+	system-lua.patch
 	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -61,6 +62,7 @@ prepare() {
 		*.patch) msg $i; cd "$_builddir"; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	./rebootstrap.sh || return 1
 	cd "$srcdir"
 	update_config_sub || return 1
 }
@@ -201,7 +203,8 @@ c608cca8ad773acebf201f581438c7e7  freeswitch.confd
 b48a5dbaa455bbe0bba4880cc06e6ff8  freeswitch.initd
 90b133b14a42c86d53d5e54dcbfbaf58  libshout-disable-examples.patch
 448ce737698753ec23283cb11725a62b  0002-mod_lua-alpine-module-search-path.patch
-4cd4923463c89bed053e6295b5a4ec40  freeswitch-mod_shout-textrels.patch"
+4cd4923463c89bed053e6295b5a4ec40  freeswitch-mod_shout-textrels.patch
+70a2a4d6021988cf40f23a4ede3c464c  system-lua.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
@@ -214,7 +217,8 @@ f83f9680d243eb254bf045571f971a6c5cf716367444cd48ed26d4c3367f4c41  modules.conf
 4c3d4db15afe51c6a29f13fded2821e3390dc21953fa7f9bcb238626a40d8037  freeswitch.initd
 db0d3c252b5664ecb071bcf6868eff77c85dd7943a63fcfcac7e19db6a0ff61f  libshout-disable-examples.patch
 0f867ea9bc20766728968523da7aac21b1def34d3f825db26d89fbc93c11d2ca  0002-mod_lua-alpine-module-search-path.patch
-be1009327de615f04956ba0b0f44183f31c263e380af8027f94b976a84bcb09a  freeswitch-mod_shout-textrels.patch"
+be1009327de615f04956ba0b0f44183f31c263e380af8027f94b976a84bcb09a  freeswitch-mod_shout-textrels.patch
+c0225fc7141da701b6233771c79b1ffb134d1c8e8318c8306c2d6045d7811ab5  system-lua.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
@@ -227,4 +231,5 @@ a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd3
 7792217db47a8f0d3d89a9c27090b9feefa8fd6e6b6651fa960be733fba9a22ac0e46f65fd6c24e489791bc0e4f42f1c5b89271541d024f1bbd593bb3b89666f  freeswitch.initd
 91a6d7c8456de65855930b371f568f0230c28422e667453aa48fababd185b47677c06ff0c79f94c2a02182439b012d48cb54548cbde3d12b8d0e1ffbb9b229cc  libshout-disable-examples.patch
 65c3d1fb08824fbdec3d9d3b332007a7847463bba272d9ba2df23ac218a2ede84eeb5a77a1a667c3dd370fe406bd2ebf8687d198a01519f4a09168418fbf39bc  0002-mod_lua-alpine-module-search-path.patch
-5f085254ca9f5dc196afd39fc55e083b1998e776d9de2428e5657d99077526c33c1fc13f12432598184ce63138447fed7c318c384b743681703f5682dc8e1e50  freeswitch-mod_shout-textrels.patch"
+5f085254ca9f5dc196afd39fc55e083b1998e776d9de2428e5657d99077526c33c1fc13f12432598184ce63138447fed7c318c384b743681703f5682dc8e1e50  freeswitch-mod_shout-textrels.patch
+099e8e966e65fb480b00f20294c6c7ba02562f62af96482b72044f8efc79f45e42a82260099d8d1e5c1afdd4aa0946afa3fd6f323ab2781c899a5a18f082d7a7  system-lua.patch"
diff --git a/main/freeswitch/system-lua.patch b/main/freeswitch/system-lua.patch
new file mode 100644
index 000000000..5f1271170
--- /dev/null
+++ b/main/freeswitch/system-lua.patch
@@ -0,0 +1,33 @@
+--- ./src/mod/languages/mod_lua/Makefile.am.orig
++++ ./src/mod/languages/mod_lua/Makefile.am
+@@ -3,15 +3,12 @@
+ 
+ MODNAME=mod_lua
+ 
+-LUA_DIR=$(switch_srcdir)/src/mod/languages/mod_lua/lua
+-LIBLUA_A=$(LUA_DIR)/liblua.a
+-
+ AM_CFLAGS += $(CFLAGS) -D_GNU_SOURCE
+ 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 = $(LUA_CFLAGS) $(AM_CPPFLAGS) -DLUA_USE_LINUX
++mod_lua_la_CFLAGS = $(LUA_CFLAGS) $(AM_CPPFLAGS) -DLUA_USE_LINUX
++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)
+ 
+ #BUILT_SOURCES = $(LIBLUA_A)
+--- ./configure.ac.orig
++++ ./configure.ac
+@@ -1376,6 +1376,8 @@
+ 
+ CHECK_ERLANG
+ 
++PKG_CHECK_MODULES(LUA, lua5.2, [have_lua=yes], [have_lua=no])
++
+ # we never use this, and hard setting it will make cross compile work better
+ ac_cv_file_dbd_apr_dbd_mysql_c=no
+