Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #397 from micmac1/fs-183-2

Browse source 
freeswitch-stable: bump to 1.8.3
This commit is contained in:
micmac1 2018-12-22 23:03:54 +01:00 committed by GitHub
commit 7f21b1d426
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/freeswitch-stable/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2017 - 2018 OpenWrt.org # Copyright (C) 2017 Sebastian Kemper <sebastian_ml@gmx.net>
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,15 +9,13 @@ include $(TOPDIR)/rules.mk
PRG_NAME:=freeswitch PRG_NAME:=freeswitch
PKG_NAME:=$(PRG_NAME)-stable PKG_NAME:=$(PRG_NAME)-stable
PKG_VERSION:=1.8.2 PKG_VERSION:=1.8.3
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL := \ PKG_SOURCE_URL:=https://files.$(PRG_NAME).org/releases/$(PRG_NAME)
https://sources.openwrt.org/ \ PKG_HASH:=327444f2f1f6ba68b268e81797a44522f44fff725ef53a7e7e5d58efdab54adb
https://files.$(PRG_NAME).org/releases/$(PRG_NAME)
PKG_HASH:=ebcf3db970ea9bb534c0983a1c9eef88395deb6e0902d8d6407bf217b2f27b9a
PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch

4
net/freeswitch-stable/patches/030-fix-configure-ac.patch
View file

@ -40,7 +40,7 @@
AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
if test "$PKG_CONFIG" = "no" \ if test "$PKG_CONFIG" = "no" \
|| test x"$enable_core_pgsql_pkgconfig" = x"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" # -a "x$ac_cv_have_EXTERN_h" != "xno"
if test "x$ac_cv_have_perl" != "xno"; then if test "x$ac_cv_have_perl" != "xno"; then
@ -55,7 +55,7 @@
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$PERL_CFLAGS" CFLAGS="$PERL_CFLAGS"
@@ -1710,24 +1680,12 @@ then @@ -1718,24 +1688,12 @@ then
if test "$python_has_distutils" != "no" ; then if test "$python_has_distutils" != "no" ; then
AC_MSG_CHECKING([location of site-packages]) AC_MSG_CHECKING([location of site-packages])

2
net/freeswitch-stable/patches/120-fix-copts.diff
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/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(OUR_DISABLED_UNINSTALL_MODS)
AC_SUBST(AM_MAKEFLAGS) AC_SUBST(AM_MAKEFLAGS)

2
net/freeswitch-stable/patches/140-libvpx-cross.patch
View file

@ -1,6 +1,6 @@
--- a/Makefile.am --- a/Makefile.am
+++ b/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: libs/libzrtp/libzrtp.a:
cd libs/libzrtp && $(MAKE) cd libs/libzrtp && $(MAKE)

11
net/freeswitch-stable/patches/380-disable-luajit.patch Normal file
View file

@ -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