From 2711cb872b9982a266e9e468272c399f5d6bb9eb Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 27 Sep 2018 22:46:02 +0200 Subject: [PATCH] freeswitch-stable: bump to 1.8.2 - bump version - go back to using release tarballs (unavailable when 1.8.1 was initially released) - add OpenWrt mirror Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 24 +++++++------------ .../patches/030-fix-configure-ac.patch | 4 ++-- .../patches/120-fix-copts.diff | 2 +- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index 4755b07..6c3d8f0 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -9,21 +9,19 @@ include $(TOPDIR)/rules.mk PRG_NAME:=freeswitch PKG_NAME:=$(PRG_NAME)-stable -PKG_VERSION:=1.8.1 -PKG_RELEASE:=6 +PKG_VERSION:=1.8.2 +PKG_RELEASE:=1 PKG_MAINTAINER:=Sebastian Kemper -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://$(PRG_NAME).org/stash/scm/fs/$(PRG_NAME).git -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=b33bc925c52b19eda0cafc079015f5bac8fe68d1 +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_CPE_ID:=cpe:/a:freeswitch:freeswitch -PKG_MIRROR_HASH:=8587be34ea2194c64cdb0e19ce84519d260fb529ac40d4a7f7eb62b1fe3ef9b2 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PRG_NAME)-$(PKG_VERSION) # configure in libs/spandsp fails without libjpeg and tiff PKG_BUILD_DEPENDS:= \ @@ -824,12 +822,8 @@ endif FS_STABLE_ANCHOR:=dnl Get build information from APR FS_STABLE_APR_LIBS:=-L$(PKG_BUILD_DIR)/libs/apr -L$(PKG_BUILD_DIR)/libs/apr-util -# With a release tarball we can just call Build/Prepare/Default. But with the -# git checkout we need to call bootstrap and apply our patches afterward. define Build/Prepare - $(PKG_UNPACK) - cd $(PKG_BUILD_DIR) && $(AM_TOOL_PATHS) ./bootstrap.sh - $(Build/Patch) + $(call Build/Prepare/Default) echo '#applications/mod_random' >> $(PKG_BUILD_DIR)/modules.conf echo '#codecs/mod_yuv' >> $(PKG_BUILD_DIR)/modules.conf diff --git a/net/freeswitch-stable/patches/030-fix-configure-ac.patch b/net/freeswitch-stable/patches/030-fix-configure-ac.patch index 847a34a..f358ec7 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" \ -@@ -1575,13 +1551,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl +@@ -1609,13 +1585,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" -@@ -1676,24 +1646,12 @@ then +@@ -1710,24 +1680,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 5191628..942b6e9 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 -@@ -1961,7 +1961,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) +@@ -1995,7 +1995,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) AC_SUBST(OUR_DISABLED_UNINSTALL_MODS) AC_SUBST(AM_MAKEFLAGS)