From e3df82e588209e4b74f1abd1bce408f16e240238 Mon Sep 17 00:00:00 2001 From: Francesco Colista Date: Wed, 1 May 2019 13:59:49 +0000 Subject: main/freeswitch: upgrade to 1.8.5 --- main/freeswitch/APKBUILD | 22 ++++++++-------- main/freeswitch/configure-lua53.patch | 21 ++++++++------- main/freeswitch/include-lua53.patch | 48 +++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 21 deletions(-) create mode 100644 main/freeswitch/include-lua53.patch diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD index 4de0c691bb..c395fa187a 100644 --- a/main/freeswitch/APKBUILD +++ b/main/freeswitch/APKBUILD @@ -2,12 +2,12 @@ # Contributor: Michael Mason # Contributor: Cameron Banta pkgname=freeswitch -pkgver=1.8.2 -pkgrel=1 +pkgver=1.8.5 +pkgrel=0 pkgdesc="A communications platform written in C from the ground up" url="http://www.freeswitch.org" arch="all" -license="GPL" +license="MPL-1.1" makedepends=" bash bsd-compat-headers @@ -57,15 +57,17 @@ FREESWITCH_USER=freeswitch FREESWITCH_GROUP=freeswitch pkgusers="$FREESWITCH_USER" pkggroups="$FREESWITCH_GROUP" -subpackages="$pkgname-dbg $pkgname-dev $pkgname-flite $pkgname-timezones::noarch +subpackages="$pkgname-static $pkgname-dev $pkgname-flite $pkgname-timezones::noarch $pkgname-sample-config:conf:noarch $pkgname-freetdm $pkgname-sangoma - $pkgname-snmp $pkgname-pgsql $pkgname-perl $pkgname-perlesl" + $pkgname-snmp $pkgname-pgsql $pkgname-perl $pkgname-perlesl + $pkgname-openrc $pkgname-dbg" -source="http://files.freeswitch.org/freeswitch-releases/$pkgname-$pkgver.tar.xz +source="https://files.freeswitch.org/freeswitch-releases/$pkgname-$pkgver.tar.xz 0001-sofia-sip-byte-order.patch 0002-FS-verto-bswap_64.patch - getlib.patch configure-lua53.patch + include-lua53.patch + getlib.patch libvpx-fix-arm-float-abi.patch disable-Werror.patch modules.conf @@ -84,7 +86,6 @@ prepare() { build() { cd "$builddir" cp -f "$srcdir/modules.conf" modules.conf - CFLAGS="-Wno-unused-but-set-variable" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -214,11 +215,12 @@ conf() { mkdir -p "$pkgdir"/etc/freeswitch/scripts } -sha512sums="30c5d2a151c95ab9c8c3252280fc25c7e7c5f7b57fb72b6a28b0673a3b9c96c9b6a5c1b85f0355122427e833e958ef86ba2960af3ee4cbcefd96f6019bc21a48 freeswitch-1.8.2.tar.xz +sha512sums="24b158166cf92f3407c56d9dcf7c209ba66d6f5feeed81bee84baaa31fef0a314d9d5eeed5e1ae9bcbd365da852c681fe30b3576e9ff92d6ab8518af1cd9f080 freeswitch-1.8.5.tar.xz 8a7ca31cc80524b02edc83af891a32af64dd7834ac14b1389112f2ce7fe06fe602d24509a299898f25e807dd0b88544aecb990bf4bd37ee1c7023ae58dacd28a 0001-sofia-sip-byte-order.patch 5f93150e1acd632df98bc3bed5613fb1e45180ae4096dcfee5c060da213c8355339260eaf5758cd77c785f6d84cf0661650a872ec574b586ab19803d4f6955f8 0002-FS-verto-bswap_64.patch +222e3510790de29e29428c70325eb1d4e7852eb4315ee546f137293868bd71acf89e7c85c5ca9d0eb708090c9eef91878a8e12c1b9d5cc99a68fecbd42ad962f configure-lua53.patch +c1960f3c7acf729468b819f7f15d66a251c3967b2784bce18c7755b333156e687c55fdc1aceda588ceb1bf9638e2fd4a31a169b00b15c5040cf1001c3c73913b include-lua53.patch 4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4 getlib.patch -6ff9a31b0b69efe13208f96e55fcbaa8fc1fad220dede74df75c5259e72a6c1fede8145981f3e81547bdfc3a849cfa8f50297a6799d7874299fc3056910e54dc configure-lua53.patch 98a53f289c3647cafd05b6f847da0504a838a6e06545c133c10fb058c2d941e6bccf2820f44649fc25f94a4a5b7c1280eaee91098e8110f96ed3342c1cb4346c libvpx-fix-arm-float-abi.patch 16e9208fca7f0a1985dd01ec38ddabb6a79da83ad6ab004bb66de528ac45f02fadaddc50a9f228e1aa38fae213fa5af0ca858b7af629b67a7d654339f813a68c disable-Werror.patch 6deecb303e765d44bdd970d5a7079c9dd9ce17d12056b68cd978a182a86b477b4a3c19d2f5a18f36199ca2e0594a3b84de521ab821e2f8c89f7449a3d7f21279 modules.conf diff --git a/main/freeswitch/configure-lua53.patch b/main/freeswitch/configure-lua53.patch index d259cb8df9..d78f7e8c20 100644 --- a/main/freeswitch/configure-lua53.patch +++ b/main/freeswitch/configure-lua53.patch @@ -1,22 +1,21 @@ +diff --git a/configure.ac b/configure.ac +index 127ee01..1b2c041 100644 --- a/configure.ac +++ b/configure.ac -@@ -597,7 +597,7 @@ +@@ -593,14 +593,14 @@ AC_SUBST(SYS_XMLRPC_CFLAGS) AC_SUBST(SYS_XMLRPC_LDFLAGS) AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"]) --for luaversion in lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do +-for luaversion in luajit lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do +for luaversion in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do PKG_CHECK_MODULES([LUA],[${luaversion}],[have_lua=yes],[have_lua=no]) if test ${have_lua} = yes; then break ---- a/configure -+++ b/configure -@@ -20080,7 +20080,7 @@ + fi + done + if test x"${LUA_LIBS}" = x"" ; then +- LUA_LIBS="-llua" ++ LUA_LIBS="-llua5.3" fi - --for luaversion in lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do -+for luaversion in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do - - succeeded=no - + AC_ARG_ENABLE(srtp, diff --git a/main/freeswitch/include-lua53.patch b/main/freeswitch/include-lua53.patch new file mode 100644 index 0000000000..8590775981 --- /dev/null +++ b/main/freeswitch/include-lua53.patch @@ -0,0 +1,48 @@ +diff --git a/src/mod/languages/mod_lua/mod_lua.cpp b/src/mod/languages/mod_lua/mod_lua.cpp +index 63aaf25..1b37b77 100644 +--- a/src/mod/languages/mod_lua/mod_lua.cpp ++++ b/src/mod/languages/mod_lua/mod_lua.cpp +@@ -34,9 +34,9 @@ + #include + #include + SWITCH_BEGIN_EXTERN_C +-#include "lua.h" +-#include +-#include ++#include "lua5.3/lua.h" ++#include ++#include + #include "mod_lua_extra.h" + SWITCH_MODULE_LOAD_FUNCTION(mod_lua_load); + SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lua_shutdown); +diff --git a/src/mod/languages/mod_lua/freeswitch_lua.h b/src/mod/languages/mod_lua/freeswitch_lua.h +index d205f6b..f34bd84 100644 +--- a/src/mod/languages/mod_lua/freeswitch_lua.h ++++ b/src/mod/languages/mod_lua/freeswitch_lua.h +@@ -2,9 +2,9 @@ + #define FREESWITCH_LUA_H + + extern "C" { +-#include "lua.h" +-#include +-#include ++#include "lua5.3/lua.h" ++#include ++#include + #include "mod_lua_extra.h" + } + #include +diff --git a/libs/esl/lua/esl_wrap.cpp b/libs/esl/lua/esl_wrap.cpp +index d89b83e..261eb97 100644 +--- a/libs/esl/lua/esl_wrap.cpp ++++ b/libs/esl/lua/esl_wrap.cpp +@@ -730,8 +730,8 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { + extern "C" { + #endif + +-#include "lua.h" +-#include "lauxlib.h" ++#include "lua5.3/lua.h" ++#include "lua5.3/lauxlib.h" + #include /* for malloc */ + #include /* for a few sanity tests */ -- cgit v1.2.3