main/freeswitch: upgrade to 1.4.7

also rework the system-lua patch so we dont need bootstrap as it takes
too much time.

Patch has been sent upstream:
https://jira.freeswitch.org/browse/FS-353

1 files changed, 34 insertions, 24 deletions

diff --git a/main/freeswitch/system-lua.patch b/main/freeswitch/system-lua.patch
index 5f1271170..b7588cf6d 100644
--- a/main/freeswitch/system-lua.patch
+++ b/main/freeswitch/system-lua.patch
@@ -1,33 +1,43 @@
---- ./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
+--- ./src/mod/languages/mod_lua/Makefile.in.orig
++++ ./src/mod/languages/mod_lua/Makefile.in
+@@ -91,22 +91,6 @@
+ 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_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 = $(LUA_CFLAGS) $(AM_CPPFLAGS) -DLUA_USE_LINUX
-+mod_lua_la_CFLAGS = $(LUA_CFLAGS) $(AM_CPPFLAGS) -DLUA_USE_LINUX
++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)
- 
- #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
+ all: all-am