From 07f9872c9d0122771d93b80da2f57ccd87069e02 Mon Sep 17 00:00:00 2001 From: Francesco Colista Date: Wed, 11 Nov 2020 13:27:52 +0000 Subject: [PATCH] main/freeswitch: upgrade to 1.10.5 This is quite a big jump, since brings two new aport (spandsp3 and sofia-sip) as new dependencies. --- .../0001-sofia-sip-byte-order.patch | 45 ------------------- main/freeswitch/APKBUILD | 10 ++--- 2 files changed, 5 insertions(+), 50 deletions(-) delete mode 100644 main/freeswitch/0001-sofia-sip-byte-order.patch diff --git a/main/freeswitch/0001-sofia-sip-byte-order.patch b/main/freeswitch/0001-sofia-sip-byte-order.patch deleted file mode 100644 index 91952fe5332..00000000000 --- a/main/freeswitch/0001-sofia-sip-byte-order.patch +++ /dev/null @@ -1,45 +0,0 @@ -From fa276af16c696e505f66e6ca18ab343f985e8f2b Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Wed, 27 Jul 2016 07:31:16 +0000 -Subject: [PATCH] sofia-sip: byte-order - ---- - libs/sofia-sip/libsofia-sip-ua/tport/ws.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c -index 7fe9f18..27d95b2 100644 ---- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c -+++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c -@@ -703,14 +703,12 @@ ssize_t ws_close(wsh_t *wsh, int16_t reason) - - uint64_t hton64(uint64_t val) - { -- if (__BYTE_ORDER == __BIG_ENDIAN) return (val); -- else return __bswap_64(val); -+ return be64toh(val); - } - - uint64_t ntoh64(uint64_t val) - { -- if (__BYTE_ORDER == __BIG_ENDIAN) return (val); -- else return __bswap_64(val); -+ return htobe64(val); - } - - --- -2.9.1 - -diff --git a/libs/sofia-sip/configure.ac b/libs/sofia-sip/configure.ac -index ca6bd3a..3d5677b 100644 ---- a/libs/sofia-sip/configure.ac -+++ b/libs/sofia-sip/configure.ac -@@ -218,7 +218,6 @@ fi - AC_C_CONST - AC_C_INLINE - AC_C_INLINE_DEFINE --AC_C_BIGENDIAN(AC_DEFINE([SWITCH_BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([SWITCH_BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian])) - - AC_C_VAR_FUNC - AC_C_MACRO_FUNCTION diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD index a471ff586ad..1c4866a5dec 100644 --- a/main/freeswitch/APKBUILD +++ b/main/freeswitch/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Michael Mason # Contributor: Cameron Banta pkgname=freeswitch -pkgver=1.10.3 -pkgrel=3 +pkgver=1.10.5 +pkgrel=0 pkgdesc="A communications platform written in C from the ground up" url="http://www.freeswitch.org" arch="all" @@ -51,6 +51,8 @@ makedepends=" xmlrpc-c-dev yasm zlib-dev + sofia-sip-dev + spandsp3-dev autoconf automake libtool @@ -66,7 +68,6 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-flite $pkgname-timezones::noa $pkgname-openrc $pkgname-dbg" source="https://files.freeswitch.org/freeswitch-releases/freeswitch-$pkgver.-release.tar.xz - 0001-sofia-sip-byte-order.patch 0002-FS-verto-bswap_64.patch configure-lua53.patch include-lua53.patch @@ -222,8 +223,7 @@ conf() { mkdir -p "$pkgdir"/etc/freeswitch/scripts } -sha512sums="1b66242c1466bdbe96f0f4016b94fe2524ee10a901f1d557e39d5ef4a4f28b1515025c9a2efe864afac94345d130ec390d6228a8854d4eaec8f9d4c3a936d7c5 freeswitch-1.10.3.-release.tar.xz -8a7ca31cc80524b02edc83af891a32af64dd7834ac14b1389112f2ce7fe06fe602d24509a299898f25e807dd0b88544aecb990bf4bd37ee1c7023ae58dacd28a 0001-sofia-sip-byte-order.patch +sha512sums="6f85d33475217a93a7c1c5d676d63d1d4e4360db2a8c1cd3afeb4fa513df3b6c04095a12d69ed6fbb84b14177026840219f078c1145a877e804ee71eefe7da8c freeswitch-1.10.5.-release.tar.xz 5f93150e1acd632df98bc3bed5613fb1e45180ae4096dcfee5c060da213c8355339260eaf5758cd77c785f6d84cf0661650a872ec574b586ab19803d4f6955f8 0002-FS-verto-bswap_64.patch 222e3510790de29e29428c70325eb1d4e7852eb4315ee546f137293868bd71acf89e7c85c5ca9d0eb708090c9eef91878a8e12c1b9d5cc99a68fecbd42ad962f configure-lua53.patch c1960f3c7acf729468b819f7f15d66a251c3967b2784bce18c7755b333156e687c55fdc1aceda588ceb1bf9638e2fd4a31a169b00b15c5040cf1001c3c73913b include-lua53.patch