freeswitch-stable: bump to 1.8.3

Refresh patches + add patch to remove luajit detection, which was added
upstream for this release. luajit is available in OpenWrt, but seems to
always fail on the buildbots. To prevent surprises in the future disable
it for now.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

5 files changed, 18 insertions, 7 deletions

diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile
index 766c457..0f03a4c 100644
--- a/net/freeswitch-stable/Makefile
+++ b/net/freeswitch-stable/Makefile
@@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk
 
 PRG_NAME:=freeswitch
 PKG_NAME:=$(PRG_NAME)-stable
-PKG_VERSION:=1.8.2
-PKG_RELEASE:=2
+PKG_VERSION:=1.8.3
+PKG_RELEASE:=1
 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 
 PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL := \
 	https://sources.openwrt.org/ \
 	https://files.$(PRG_NAME).org/releases/$(PRG_NAME)
-PKG_HASH:=ebcf3db970ea9bb534c0983a1c9eef88395deb6e0902d8d6407bf217b2f27b9a
+PKG_HASH:=327444f2f1f6ba68b268e81797a44522f44fff725ef53a7e7e5d58efdab54adb
 
 PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch
 
diff --git a/net/freeswitch-stable/patches/030-fix-configure-ac.patch b/net/freeswitch-stable/patches/030-fix-configure-ac.patch
index f358ec7..602013b 100644
--- a/net/freeswitch-stable/patches/030-fix-configure-ac.patch
+++ b/net/freeswitch-stable/patches/030-fix-configure-ac.patch
@@ -40,7 +40,7 @@
    AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
      if test "$PKG_CONFIG" = "no" \
         || test x"$enable_core_pgsql_pkgconfig" = x"no" \
-@@ -1609,13 +1585,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl
+@@ -1617,13 +1593,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl
  # -a "x$ac_cv_have_EXTERN_h" != "xno"
  
  if test "x$ac_cv_have_perl" != "xno"; then
@@ -55,7 +55,7 @@
  
     save_CFLAGS="$CFLAGS"
     CFLAGS="$PERL_CFLAGS"
-@@ -1710,24 +1680,12 @@ then
+@@ -1718,24 +1688,12 @@ then
  		if test "$python_has_distutils" != "no" ; then
  			AC_MSG_CHECKING([location of site-packages])
  
diff --git a/net/freeswitch-stable/patches/120-fix-copts.diff b/net/freeswitch-stable/patches/120-fix-copts.diff
index 942b6e9..3eeeb9d 100644
--- a/net/freeswitch-stable/patches/120-fix-copts.diff
+++ b/net/freeswitch-stable/patches/120-fix-copts.diff
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1995,7 +1995,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
+@@ -2009,7 +2009,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
  AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
  AC_SUBST(AM_MAKEFLAGS)
  
diff --git a/net/freeswitch-stable/patches/140-libvpx-cross.patch b/net/freeswitch-stable/patches/140-libvpx-cross.patch
index 815aa18..5045fb9 100644
--- a/net/freeswitch-stable/patches/140-libvpx-cross.patch
+++ b/net/freeswitch-stable/patches/140-libvpx-cross.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -572,8 +572,13 @@ libs/libedit/src/.libs/libedit.a:
+@@ -577,8 +577,13 @@ libs/libedit/src/.libs/libedit.a:
  libs/libzrtp/libzrtp.a:
  	cd libs/libzrtp && $(MAKE)
  
diff --git a/net/freeswitch-stable/patches/380-disable-luajit.patch b/net/freeswitch-stable/patches/380-disable-luajit.patch
new file mode 100644
index 0000000..cb9c5ac
--- /dev/null
+++ b/net/freeswitch-stable/patches/380-disable-luajit.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -584,7 +584,7 @@ AC_SUBST(SYS_XMLRPC_CFLAGS)
+ AC_SUBST(SYS_XMLRPC_LDFLAGS)
+ AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"])
+ 
+-for luaversion in luajit lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
++for luaversion in 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