From 7f01f54adc646abb8c64db665bffb2a7781705c6 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 22 Dec 2018 22:44:36 +0100 Subject: [PATCH 1/3] 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 --- net/freeswitch-stable/Makefile | 6 +++--- .../patches/030-fix-configure-ac.patch | 4 ++-- net/freeswitch-stable/patches/120-fix-copts.diff | 2 +- net/freeswitch-stable/patches/140-libvpx-cross.patch | 2 +- .../patches/380-disable-luajit.patch | 11 +++++++++++ 5 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 net/freeswitch-stable/patches/380-disable-luajit.patch 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 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 From 61681ed947597aade7884bb5006447a1256748a8 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 22 Dec 2018 22:51:03 +0100 Subject: [PATCH 2/3] freeswitch-stable: remove OpenWrt mirror sources.openwrt.org is used by the build system as a last-resort mirror. It's not supposed to be used as a regular source mirror. Remove it from PKG_SOURCE_URL. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index 0f03a4c..f897385 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -14,9 +14,7 @@ PKG_RELEASE:=1 PKG_MAINTAINER:=Sebastian Kemper PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL := \ - https://sources.openwrt.org/ \ - https://files.$(PRG_NAME).org/releases/$(PRG_NAME) +PKG_SOURCE_URL:=https://files.$(PRG_NAME).org/releases/$(PRG_NAME) PKG_HASH:=327444f2f1f6ba68b268e81797a44522f44fff725ef53a7e7e5d58efdab54adb PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch From fa6b2e643793b5bf7c2dc0bcaef80805dee8a3da Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 22 Dec 2018 22:54:20 +0100 Subject: [PATCH 3/3] freeswitch-stable: fix copyright header Maintainer is not affiliated with OpenWrt so copyright needs to be set to maintainer instead of OpenWrt. Also correct the year - it should read the year in which the Makefile was first written. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index f897385..ace892c 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2017 - 2018 OpenWrt.org +# Copyright (C) 2017 Sebastian Kemper # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information.