Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -0,0 +1,42 @@
|
||||
From d12e74a559602b3dff9a6bf38fcbb139535c9c9c Mon Sep 17 00:00:00 2001
|
||||
From: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
Date: Mon, 3 Sep 2018 20:27:00 +0200
|
||||
Subject: [PATCH] m4: fix local ffmpeg and avcodec function conflict
|
||||
|
||||
Autotools miss avcodec function check.
|
||||
This is due to linker library list order, -ldrm is appended too early
|
||||
respect to -lavutil. This results in missing drm library functions for
|
||||
avcodec functions:
|
||||
- drmGetVersion()
|
||||
- drmFreeVersion()
|
||||
So these functions:
|
||||
- avcodec_get_context_defaults3
|
||||
- avcodec_open2
|
||||
- avcodec_encode_video2
|
||||
can't link correctly during check and they seem not to be present.
|
||||
Then macros HAVE_FUN_avcodec_* are not defined in mediastreamer-config.h
|
||||
So local avcodec functions conflict with real avcodec library functions.
|
||||
|
||||
In acinclude.m4 file, swap $FFMPEG_LIBS and -lavutil if avcodec is found.
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
---
|
||||
acinclude.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index 6c31ed82..89ff6643 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -110,7 +110,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
|
||||
if test x$avcodec_found = xno ; then
|
||||
AC_MSG_WARN([Could not find libavcodec (from ffmpeg) headers and library.])
|
||||
else
|
||||
- FFMPEG_LIBS="$FFMPEG_LIBS -lavutil"
|
||||
+ FFMPEG_LIBS="-lavutil $FFMPEG_LIBS"
|
||||
fi
|
||||
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
config BR2_PACKAGE_MEDIASTREAMER
|
||||
bool "mediastreamer"
|
||||
select BR2_PACKAGE_ORTP
|
||||
depends on BR2_INSTALL_LIBSTDCPP # ortp
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
|
||||
select BR2_PACKAGE_ORTP
|
||||
help
|
||||
Mediastreamer is a powerful and lightweighted streaming
|
||||
engine specialized for voice/video telephony applications.
|
||||
|
||||
@@ -11,7 +11,7 @@ MEDIASTREAMER_INSTALL_STAGING = YES
|
||||
MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext host-vim
|
||||
# tests fail linking on some architectures, so disable them
|
||||
MEDIASTREAMER_CONF_OPTS = --disable-tests --disable-glx --disable-strict
|
||||
MEDIASTREAMER_LICENSE = GPLv2+
|
||||
MEDIASTREAMER_LICENSE = GPL-2.0+
|
||||
MEDIASTREAMER_LICENSE_FILES = COPYING
|
||||
|
||||
# patching configure.ac
|
||||
|
||||
Reference in New Issue
Block a user