Buildroot 2018-11 (#258)
* Update to buildroot 2018.11 * containerd update * runc update * runc docker engine * runc docker proxy * update rpi firmware * update network manager * update dhcpd * update wait on network * update rpi wifi * revert glibc
This commit is contained in:
Pascal Vizeli
@@ -18,12 +18,12 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
diff -uNr freeswitch-1.6.7.org/Makefile.in freeswitch-1.6.7/Makefile.in
|
||||
--- freeswitch-1.6.7.org/Makefile.in 2016-04-01 18:09:54.000000000 +0200
|
||||
+++ freeswitch-1.6.7/Makefile.in 2016-04-22 20:11:37.938961730 +0200
|
||||
@@ -3491,7 +3491,7 @@
|
||||
@@ -4025,7 +4025,7 @@
|
||||
cd libs/libzrtp && $(MAKE)
|
||||
|
||||
libs/libvpx/Makefile:
|
||||
- cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
|
||||
+ cd libs/libvpx && CROSS=$(CROSS) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
|
||||
- cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384 --extra-cflags="$(VISIBILITY_FLAG)"
|
||||
+ cd libs/libvpx && CROSS=$(CROSS) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384 --extra-cflags="$(VISIBILITY_FLAG)"
|
||||
|
||||
libs/libvpx/libvpx.a: libs/libvpx/Makefile
|
||||
@cd libs/libvpx && $(MAKE)
|
||||
@@ -0,0 +1,74 @@
|
||||
From 72f2f7047ad35b37002d6210458667a89c301cfe Mon Sep 17 00:00:00 2001
|
||||
From: jbeich <jbeich@FreeBSD.org>
|
||||
Date: Thu, 16 Aug 2018 22:14:20 +0200
|
||||
Subject: [PATCH] mod_av: unbreak with ffmpeg 4.0
|
||||
|
||||
avformat.c:471:14: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER'
|
||||
c->flags|=CODEC_FLAG_LOOP_FILTER; // flags=+loop
|
||||
^
|
||||
avformat.c:477:47: error: use of undeclared identifier 'ME_HEX'
|
||||
av_opt_set_int(c->priv_data, "motion_est", ME_HEX, 0);
|
||||
^
|
||||
avformat.c:553:15: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
|
||||
c->flags |= CODEC_FLAG_GLOBAL_HEADER;
|
||||
^
|
||||
avformat.c:638:31: error: use of undeclared identifier 'CODEC_CAP_VARIABLE_FRAME_SIZE'
|
||||
if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
|
||||
^
|
||||
|
||||
PR: 227726
|
||||
Reported by: antoine (via exp-run)
|
||||
|
||||
Downloaded from
|
||||
https://github.com/freebsd/freebsd-ports/commit/da104360ea7d7861aa9fe6dc04b776a1eaf794ec
|
||||
|
||||
Original file
|
||||
https://svnweb.freebsd.org/ports/head/net/freeswitch/files/patch-ffmpeg4?view=markup
|
||||
|
||||
[Bernd: Rebased for freeswitch 1.8.2]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/mod/applications/mod_av/avformat.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c
|
||||
index 84900b601c..2f5c0e8d20 100644
|
||||
--- a/src/mod/applications/mod_av/avformat.c
|
||||
+++ b/src/mod/applications/mod_av/avformat.c
|
||||
@@ -479,13 +479,13 @@ GCC_DIAG_ON(deprecated-declarations)
|
||||
c->ticks_per_frame = 2;
|
||||
|
||||
|
||||
- c->flags|=CODEC_FLAG_LOOP_FILTER; // flags=+loop
|
||||
+ c->flags|=AV_CODEC_FLAG_LOOP_FILTER; // flags=+loop
|
||||
c->me_cmp|= 1; // cmp=+chroma, where CHROMA = 1
|
||||
c->me_range = 16; // me_range=16
|
||||
c->max_b_frames = 3; // bf=3
|
||||
|
||||
av_opt_set_int(c->priv_data, "b_strategy", 1, 0);
|
||||
- av_opt_set_int(c->priv_data, "motion_est", ME_HEX, 0);
|
||||
+ av_opt_set(c->priv_data, "motion_est", "hex", 0);
|
||||
av_opt_set_int(c->priv_data, "coder", 1, 0);
|
||||
|
||||
switch (mm->vprofile) {
|
||||
@@ -568,7 +568,7 @@ GCC_DIAG_ON(deprecated-declarations)
|
||||
|
||||
/* Some formats want stream headers to be separate. */
|
||||
if (fc->oformat->flags & AVFMT_GLOBALHEADER) {
|
||||
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
|
||||
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
|
||||
}
|
||||
|
||||
mst->active = 1;
|
||||
@@ -660,7 +660,7 @@ GCC_DIAG_ON(deprecated-declarations)
|
||||
mst->frame->format = AV_SAMPLE_FMT_S16;
|
||||
mst->frame->channel_layout = c->channel_layout;
|
||||
|
||||
- if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
|
||||
+ if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
|
||||
//mst->frame->nb_samples = 10000;
|
||||
mst->frame->nb_samples = (mst->frame->sample_rate / 50) * c->channels;
|
||||
} else {
|
||||
--
|
||||
2.19.0
|
||||
|
||||
@@ -17,7 +17,9 @@ config BR2_PACKAGE_FREESWITCH
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_PCRE
|
||||
select BR2_PACKAGE_SPEEX
|
||||
select BR2_PACKAGE_SPEEXDSP
|
||||
select BR2_PACKAGE_SQLITE
|
||||
select BR2_PACKAGE_TIFF
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
||||
select BR2_PACKAGE_ZLIB
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.20.tar.xz.md5
|
||||
md5 e9890a2d6ca6f58dd3fa440fdfbf91a0 freeswitch-1.6.20.tar.xz
|
||||
# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.20.tar.xz.sha1
|
||||
sha1 ce284b805e262504cbb1f74796785b4dfa70d5ac freeswitch-1.6.20.tar.xz
|
||||
# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.20.tar.xz.sha256
|
||||
sha256 dbb0f73109171bd381772b247b8ef581f6a176964619082a1fe031b004086f6b freeswitch-1.6.20.tar.xz
|
||||
# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.2.tar.xz.md5
|
||||
md5 61de81cd70afb056dde7b1dcb91ad967 freeswitch-1.8.2.tar.xz
|
||||
# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.2.tar.xz.sha1
|
||||
sha1 f2c077db40b05c5fdf66cbe77bd879f41132f79a freeswitch-1.8.2.tar.xz
|
||||
# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.2.tar.xz.sha256
|
||||
sha256 ebcf3db970ea9bb534c0983a1c9eef88395deb6e0902d8d6407bf217b2f27b9a freeswitch-1.8.2.tar.xz
|
||||
# Locally computed
|
||||
sha256 10299420c1e8602c0daf5a59d022621cd72a9148d1f0f33501edb3db3445c7fe COPYING
|
||||
sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE
|
||||
sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/apr-util/LICENSE
|
||||
sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE
|
||||
sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE
|
||||
sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c
|
||||
sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 libs/sofia-sip/COPYING
|
||||
sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 libs/sofia-sip/COPYRIGHTS
|
||||
sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a libs/spandsp/COPYING
|
||||
sha256 8defed37d52096ae14b60adc499c33d43975109bc265552ee67e9a888c634b93 libs/srtp/LICENSE
|
||||
sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 libs/tiff-4.0.2/COPYRIGHT
|
||||
sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE
|
||||
sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FREESWITCH_VERSION = 1.6.20
|
||||
FREESWITCH_VERSION = 1.8.2
|
||||
FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz
|
||||
FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases
|
||||
# External modules need headers/libs from staging
|
||||
@@ -14,8 +14,7 @@ FREESWITCH_LICENSE = MPL-1.1, \
|
||||
Apache-2.0 (apr, apr-util), \
|
||||
LGPL-2.0+ (sofia-sip), \
|
||||
LGPL-2.1, GPL-2.0 (spandsp), \
|
||||
BSD-3-Clause (libsrtp), \
|
||||
tiff license
|
||||
BSD-3-Clause (libsrtp)
|
||||
|
||||
FREESWITCH_LICENSE_FILES = \
|
||||
COPYING \
|
||||
@@ -24,8 +23,7 @@ FREESWITCH_LICENSE_FILES = \
|
||||
libs/sofia-sip/COPYING \
|
||||
libs/sofia-sip/COPYRIGHTS \
|
||||
libs/spandsp/COPYING \
|
||||
libs/srtp/LICENSE \
|
||||
libs/tiff-4.0.2/COPYRIGHT
|
||||
libs/srtp/LICENSE
|
||||
|
||||
# required dependencies
|
||||
FREESWITCH_DEPENDENCIES = \
|
||||
@@ -36,6 +34,7 @@ FREESWITCH_DEPENDENCIES = \
|
||||
pcre \
|
||||
speex \
|
||||
sqlite \
|
||||
tiff \
|
||||
util-linux \
|
||||
zlib
|
||||
|
||||
@@ -150,6 +149,7 @@ FREESWITCH_ENABLED_MODULES += \
|
||||
say/mod_say_sv \
|
||||
say/mod_say_th \
|
||||
say/mod_say_zh \
|
||||
timers/mod_timerfd \
|
||||
xml_int/mod_xml_cdr \
|
||||
xml_int/mod_xml_rpc \
|
||||
xml_int/mod_xml_scgi
|
||||
|
||||
Reference in New Issue
Block a user