Bump buildroot to 2019.02

2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
--- a/bsp/buildroot/package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch
+++ b/bsp/buildroot/package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch
@@ -0,0 +1,40 @@
+From 7c2b3343a30ee53a1cded2ca5e712d8cd7d50f5f Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Tue, 1 May 2018 22:27:21 +0200
+Subject: [PATCH] Disable building of statically linked vlc binary
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ Makefile.am     | 2 +-
+ bin/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3ac82623ad..637504a3f5 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -108,7 +108,7 @@ libvlc: libvlccore
+ 	cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
+ 
+ core: libvlc vlc$(EXEEXT)
+-	cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)
+	cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+ 
+ doc:
+ 	cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index 2877e8b0ea..bef4160e8b 100644
+--- a/bin/Makefile.am
+++ b/bin/Makefile.am
+@@ -6,7 +6,7 @@ bin_PROGRAMS = vlc-osx
+ noinst_PROGRAMS = vlc-osx-static
+ else
+ bin_PROGRAMS = vlc
+-noinst_PROGRAMS = vlc-static
+noinst_PROGRAMS =
+ endif
+ endif
+ EXTRA_DIST = vlc_win32_rc.rc.in
+-- 
+2.14.4
+
--- a/bsp/buildroot/package/vlc/0001-vlc-static.patch
+++ b/bsp/buildroot/package/vlc/0001-vlc-static.patch
@@ -1,24 +0,0 @@
-diff -uNr vlc-2.1.5.org/bin/Makefile.am vlc-2.1.5/bin/Makefile.am
--- vlc-2.1.5.org/bin/Makefile.am	2013-12-03 10:12:34.000000000 +0100
-+++ vlc-2.1.5/bin/Makefile.am	2014-08-03 12:30:06.722154518 +0200
-@@ -1,7 +1,7 @@
- # Building vlc
- #
- bin_PROGRAMS = vlc
-noinst_PROGRAMS = vlc-static
-+noinst_PROGRAMS =
- noinst_DATA =
- vlclib_PROGRAMS = vlc-cache-gen
- EXTRA_PROGRAMS = vlc-wrapper
-diff -uNr vlc-2.1.5.org/Makefile.am vlc-2.1.5/Makefile.am
--- vlc-2.1.5.org/Makefile.am	2014-02-14 18:40:50.000000000 +0100
-+++ vlc-2.1.5/Makefile.am	2014-08-03 12:29:52.059010766 +0200
-@@ -932,7 +932,7 @@
- 	cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
- 
- core: libvlc vlc$(EXEEXT)
-	cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)
-+	cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
- 
- doc:
- 	cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
--- a/bsp/buildroot/package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch
+++ b/bsp/buildroot/package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch
@@ -1,43 +0,0 @@
-From 88bf3313850bc7f0e6db21daee2b8d8e607b7bb4 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Sat, 8 Feb 2014 14:33:27 +0100
-Subject: [PATCH] configure.ac: add check for libgcrypt-config program
-
-This allows to override the default libgcrypt-config location (which is
-useful when cross-compiling), instead of using the one from the host
-system.
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-[yann.morin.1998@free.fr: adapt from 2.1.6 to 2.2.0; fix quoting in
- AC_PATH_PROG]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
- configure.ac | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 02fb8aa..5a2267b 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -4020,16 +4020,17 @@
- AC_ARG_ENABLE(libgcrypt,
-   [  --disable-libgcrypt     gcrypt support (default enabled)])
- AS_IF([test "${enable_libgcrypt}" != "no"], [
-+  AC_PATH_PROG([GCRYPT_CONFIG],[libgcrypt-config],[libgcrypt-config])
-   AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
-    libgcrypt-config --version >/dev/null || \
-+    ${GCRYPT_CONFIG} --version >/dev/null || \
-         AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found])
-     AC_CHECK_LIB(gcrypt, gcry_control, [
-       have_libgcrypt="yes"
-      GCRYPT_CFLAGS="`libgcrypt-config --cflags`"
-      GCRYPT_LIBS="`libgcrypt-config --libs`"
-+      GCRYPT_CFLAGS="`${GCRYPT_CONFIG} --cflags`"
-+      GCRYPT_LIBS="`${GCRYPT_CONFIG} --libs`"
-     ], [
-       AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or pass --disable-libgcrypt.])
-    ], [`libgcrypt-config --libs`])
-+    ], [`${GCRYPT_CONFIG} --libs`])
-   ], [
-     AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or pass --disable-libgcrypt.])
-   ], [#include <gcrypt.h>]
--- a/bsp/buildroot/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch
+++ b/bsp/buildroot/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch
@@ -0,0 +1,41 @@
+From 00135e21bec84a2fe5920d02fa0982ceb9f89a35 Mon Sep 17 00:00:00 2001
+From: Vinson Lee <vlee@freedesktop.org>
+Date: Thu, 5 Feb 2015 14:48:53 -0800
+Subject: [PATCH] lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0
+ compatibility.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In Lua 5.3.0, luaL_checkint was deprecated.
+
+This patch fixes this build error with Lua 5.3.0.
+
+lua/demux.c: In function ‘vlclua_demux_peek’:
+lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
+     int n = luaL_checkint( L, 1 );
+     ^
+
+Signed-off-by: Vinson Lee <vlee@freedesktop.org>
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+[Backport upstream commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ modules/lua/vlc.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index 71f381d334..b46b5f67a1 100644
+--- a/modules/lua/vlc.h
+++ b/modules/lua/vlc.h
+@@ -38,6 +38,7 @@
+ #include <vlc_stream.h>
+ #include <vlc_demux.h>
+ 
+#define LUA_COMPAT_APIINTCASTS
+ #define LUA_COMPAT_MODULE
+ #include <lua.h>        /* Low level lua C API */
+ #include <lauxlib.h>    /* Higher level C API */
+-- 
+2.14.4
+
--- a/bsp/buildroot/package/vlc/0003-automake-add-subdir-objects-option.patch
+++ b/bsp/buildroot/package/vlc/0003-automake-add-subdir-objects-option.patch
@@ -1,4 +1,7 @@
-automake: add subdir-objects option
+From 54e7e0bda02099ae9d1c42abed1932ffa8d354e8 Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
+Date: Tue, 1 May 2018 22:28:52 +0200
+Subject: [PATCH] automake: add subdir-objects option

 Our version of automake warns if this option is enabled and source files
 in subdirectories are used.
@@ -7,10 +10,14 @@ It doesn't really seems to have a noticable effect on the build, but it
 does remove a lot of annoying warnings.

 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

-diff -Nrup vlc-2.1.2.orig/configure.ac vlc-2.1.2/configure.ac
--- vlc-2.1.2.orig/configure.ac	2014-02-27 00:22:19.512944952 +0100
-+++ vlc-2.1.2/configure.ac	2014-02-27 00:24:21.360940651 +0100
+diff --git a/configure.ac b/configure.ac
+index 206690b468..dfb4c1c329 100644
+--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_PRESERVE_HELP_ORDER
@@ -19,4 +26,7 @@ diff -Nrup vlc-2.1.2.orig/configure.ac vlc-2.1.2/configure.ac
 +AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
 AC_CONFIG_HEADERS([config.h])
 
- # Disable with "./configure --disable-silent-rules" or "make V=1"
+ AM_SILENT_RULES([yes])
+-- 
+2.14.4
+
--- a/bsp/buildroot/package/vlc/0004-build-use-pkg-config-to-get-tremor-libs.patch
+++ b/bsp/buildroot/package/vlc/0004-build-use-pkg-config-to-get-tremor-libs.patch
@@ -0,0 +1,50 @@
+From fb257e1e204c30436b3509ea3fa9f7c5fe131dc1 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 16 Oct 2018 14:25:20 +0200
+Subject: [PATCH] build: use pkg-config to get tremor libs
+
+Use PKG_ENABLE_MODULES_VLC to enable tremor based on availability of
+ogg and vorbisidec
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ configure.ac              | 9 +--------
+ modules/codec/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0d3222e00f..b506d735f2 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -2710,14 +2710,7 @@ PKG_ENABLE_MODULES_VLC([VORBIS], [], [ogg vorbis >= 1.1 vorbisenc >= 1.1], [Vorb
+ dnl
+ dnl  Tremor plugin
+ dnl
+-AC_ARG_ENABLE(tremor,
+-  [  --enable-tremor         Tremor decoder support (default disabled)])
+-if test "${enable_tremor}" = "yes"
+-then
+-  AC_CHECK_HEADERS(tremor/ivorbiscodec.h, [
+-    VLC_ADD_PLUGIN([tremor])
+-   ],[])
+-fi
+PKG_ENABLE_MODULES_VLC([TREMOR], [], [vorbisidec ogg], [Tremor decoder support], [disabled])
+ 
+ dnl
+ dnl  Speex plugins
+diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
+index 075ee2a0e9..637b1d45a6 100644
+--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
+@@ -318,7 +318,7 @@ codec_LTLIBRARIES += $(LTLIBdaala)
+ libtremor_plugin_la_SOURCES = codec/vorbis.c
+ libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
+ libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+-libtremor_plugin_la_LIBADD = -lvorbisdec -logg
+libtremor_plugin_la_LIBADD = $(TREMOR_LIBS)
+ EXTRA_LTLIBRARIES += libtremor_plugin.la
+ codec_LTLIBRARIES += $(LTLIBtremor)
+ 
+-- 
+2.17.1
+
--- a/bsp/buildroot/package/vlc/0004-implicit-function-declaration.patch
+++ b/bsp/buildroot/package/vlc/0004-implicit-function-declaration.patch
@@ -1,20 +0,0 @@
-Fix compile warning being treated as error:
-
-codec/svg.c: In function 'DecodeBlock':
-codec/svg.c:240:5: error: implicit declaration of function 'rsvg_handle_render_cairo' [-Werror=implicit-function-declaration]
-cc1: some warnings being treated as errors
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr vlc-2.2.1.org/configure.ac vlc-2.2.1/configure.ac
--- vlc-2.2.1.org/configure.ac	2015-04-13 09:57:54.000000000 +0200
-+++ vlc-2.2.1/configure.ac	2015-04-24 20:54:35.349039010 +0200
-@@ -864,7 +864,7 @@
- dnl  Compiler warnings
- dnl
- 
-RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
-+RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var])
- RDC_PROG_CC_FLAGS([-pipe])
- AC_LANG_PUSH([C++])
- RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var])
--- a/bsp/buildroot/package/vlc/0005-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch
+++ b/bsp/buildroot/package/vlc/0005-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch
@@ -0,0 +1,44 @@
+From bbb15b9cbf9353423619f2c40abdf95d861e66ba Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 2 Apr 2016 16:49:54 +0200
+Subject: [PATCH] Fix build error using uClibc by adding sys/types.h
+
+Fixes
+
+  CC       core.lo
+In file included from libvlc_internal.h:35:0,
+                 from core.c:28:
+../include/vlc/libvlc_media.h:313:18: error: expected declaration specifiers or '...' before '*' token
+ typedef ssize_t (*libvlc_media_read_cb)(void *opaque, unsigned char *buf,
+                  ^
+../include/vlc/libvlc_media.h:423:36: error: unknown type name 'libvlc_media_read_cb'
+                                    libvlc_media_read_cb read_cb,
+                                    ^
+Bug was reported to trac:
+https://trac.videolan.org/vlc/ticket/16768
+
+This patch was suggested by courmisch in the trac ticket.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Patch sent upstream:
+ https://mailman.videolan.org/pipermail/vlc-devel/2016-April/106952.html]
+---
+ include/vlc/libvlc_media.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
+index 383f366b69..1cbf00c3e3 100644
+--- a/include/vlc/libvlc_media.h
+++ b/include/vlc/libvlc_media.h
+@@ -26,6 +26,8 @@
+ #ifndef VLC_LIBVLC_MEDIA_H
+ #define VLC_LIBVLC_MEDIA_H 1
+ 
+#include <sys/types.h>  /* for ssize_t */
+
+ # ifdef __cplusplus
+ extern "C" {
+ # endif
+-- 
+2.14.4
+
--- a/bsp/buildroot/package/vlc/0005-libvorbisidec.patch
+++ b/bsp/buildroot/package/vlc/0005-libvorbisidec.patch
@@ -1,18 +0,0 @@
-Fixes linking error with tremor due to wrong library name
-
-Downloaded from Gentoo package
-https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch?view=markup
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
--- a/modules/codec/Makefile.am
-+++ b/modules/codec/Makefile.am
-@@ -215,7 +215,7 @@
- libtremor_plugin_la_SOURCES = codec/vorbis.c
- libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
- libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
-libtremor_plugin_la_LIBADD = -lvorbisdec -logg
-+libtremor_plugin_la_LIBADD = $(VORBIS_LIBS) $(OGG_LIBS)
- EXTRA_LTLIBRARIES += libtremor_plugin.la
- codec_LTLIBRARIES += $(LTLIBtremor)
- 
--- a/bsp/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch
+++ b/bsp/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch
@@ -0,0 +1,58 @@
+From 0435cf37308652af1cf244b6429e919fa7ffaa95 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Tue, 1 May 2018 22:31:23 +0200
+Subject: [PATCH] Don't assume strerror_l() is available
+
+Fix compile error
+
+  CCLD     vlc
+/home/br/br3/output/build/vlc-2.2.1/src/.libs/libvlccore.so: undefined reference to `strerror_l'
+
+Code for #else condition was taken from
+http://patches.osdyson.org/patch/series/view/vlc/2.2.0~rc2-1+dyson2/dyson.patch
+
+[Bernd: rebased for vlc-3.0.6]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure.ac      | 2 +-
+ src/posix/error.c | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dfb4c1c329..bfe43512a2 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -590,7 +590,7 @@ dnl Check for system libs needed
+ need_libc=false
+ 
+ dnl Check for usual libc functions
+-AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
+AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale strerror_l stricmp strnicmp strptime uselocale])
+ AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
+ AC_REPLACE_FUNCS([gettimeofday])
+ AC_CHECK_FUNC(fdatasync,,
+diff --git a/src/posix/error.c b/src/posix/error.c
+index db51004601..b4aa6fb3ca 100644
+--- a/src/posix/error.c
+++ b/src/posix/error.c
+@@ -31,6 +31,7 @@
+ 
+ static const char *vlc_strerror_l(int errnum, const char *lname)
+ {
+#ifdef HAVE_STRERROR_L
+     int saved_errno = errno;
+     locale_t loc = newlocale(LC_MESSAGES_MASK, lname, (locale_t)0);
+ 
+@@ -51,6 +52,9 @@ static const char *vlc_strerror_l(int errnum, const char *lname)
+     const char *buf = strerror_l(errnum, loc);
+ 
+     freelocale(loc);
+#else
+    const char *buf = strerror(errnum);
+#endif
+     return buf;
+ }
+ 
+-- 
+2.14.4
+
--- a/bsp/buildroot/package/vlc/0006-qt-x11.patch
+++ b/bsp/buildroot/package/vlc/0006-qt-x11.patch
@@ -1,16 +0,0 @@
-libX11 is an optional dependency for the qt4 module
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr vlc-2.2.1.org/modules/gui/qt4/Makefile.am vlc-2.2.1/modules/gui/qt4/Makefile.am
--- vlc-2.2.1.org/modules/gui/qt4/Makefile.am	2014-11-29 12:34:15.000000000 +0100
-+++ vlc-2.2.1/modules/gui/qt4/Makefile.am	2015-04-27 18:53:36.968611490 +0200
-@@ -22,7 +22,7 @@
- if HAVE_WIN32
- libqt4_plugin_la_LIBADD += -lole32 -lcomctl32 -luuid
- else
-libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11
-+libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB)
- endif
- endif
- if HAVE_DARWIN
--- a/bsp/buildroot/package/vlc/0007-posix-remove-ancient-run-time-fallback-to-real-time-.patch
+++ b/bsp/buildroot/package/vlc/0007-posix-remove-ancient-run-time-fallback-to-real-time-.patch
@@ -0,0 +1,187 @@
+From 5d561e1e2dcde3c9fca4d925f12447009d0d4a4c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Wed, 18 Apr 2018 17:23:57 +0300
+Subject: [PATCH] posix: remove ancient run-time fallback to real-time clock
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+posix: remove ancient run-time fallback to real-time clock
+
+For hysterical raisins, GNU/Linux and possibly some other OSes still
+report that monotonic clock must be checked at run-time, although I
+doubt that VLC or even current glibc would run on such old kernel.
+
+Drop that to simplify and avoid the systematic one-time init check.
+
+Downloaded from upstream commit to fix build error on m68k:
+
+posix/thread.c:79:5: warning: #warning Monotonic clock not available. Expect timing issues. [-Wcpp]
+ #   warning Monotonic clock not available. Expect timing issues.
+     ^~~~~~~
+posix/thread.c: In function ‘vlc_clock_setup_once’:
+posix/thread.c:88:18: error: lvalue required as left operand of assignment
+     vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC;
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/posix/thread.c | 96 +++++++-----------------------------------------------
+ 1 file changed, 11 insertions(+), 85 deletions(-)
+
+diff --git a/src/posix/thread.c b/src/posix/thread.c
+index dab8b71f97..8878941913 100644
+--- a/src/posix/thread.c
+++ b/src/posix/thread.c
+@@ -51,62 +51,16 @@
+ # include <sys/pset.h>
+ #endif
+ 
+-#if !defined (_POSIX_TIMERS)
+-# define _POSIX_TIMERS (-1)
+-#endif
+-#if !defined (_POSIX_CLOCK_SELECTION)
+-/* Clock selection was defined in 2001 and became mandatory in 2008. */
+-# define _POSIX_CLOCK_SELECTION (-1)
+-#endif
+-#if !defined (_POSIX_MONOTONIC_CLOCK)
+-# define _POSIX_MONOTONIC_CLOCK (-1)
+-#endif
+-
+-#if (_POSIX_TIMERS > 0)
+ static unsigned vlc_clock_prec;
+ 
+-# if (_POSIX_MONOTONIC_CLOCK > 0) && (_POSIX_CLOCK_SELECTION > 0)
+-/* Compile-time POSIX monotonic clock support */
+-#  define vlc_clock_id (CLOCK_MONOTONIC)
+-
+-# elif (_POSIX_MONOTONIC_CLOCK == 0) && (_POSIX_CLOCK_SELECTION > 0)
+-/* Run-time POSIX monotonic clock support (see clock_setup() below) */
+-static clockid_t vlc_clock_id;
+-
+-# else
+-/* No POSIX monotonic clock support */
+-#   define vlc_clock_id (CLOCK_REALTIME)
+-#   warning Monotonic clock not available. Expect timing issues.
+-
+-# endif /* _POSIX_MONOTONIC_CLOKC */
+-
+ static void vlc_clock_setup_once (void)
+ {
+-# if (_POSIX_MONOTONIC_CLOCK == 0)
+-    long val = sysconf (_SC_MONOTONIC_CLOCK);
+-    assert (val != 0);
+-    vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC;
+-# endif
+-
+     struct timespec res;
+-    if (unlikely(clock_getres (vlc_clock_id, &res) != 0 || res.tv_sec != 0))
+    if (unlikely(clock_getres(CLOCK_MONOTONIC, &res) != 0 || res.tv_sec != 0))
+         abort ();
+     vlc_clock_prec = (res.tv_nsec + 500) / 1000;
+ }
+ 
+-static pthread_once_t vlc_clock_once = PTHREAD_ONCE_INIT;
+-
+-# define vlc_clock_setup() \
+-    pthread_once(&vlc_clock_once, vlc_clock_setup_once)
+-
+-#else /* _POSIX_TIMERS */
+-
+-# include <sys/time.h> /* gettimeofday() */
+-
+-# define vlc_clock_setup() (void)0
+-# warning Monotonic clock not available. Expect timing issues.
+-#endif /* _POSIX_TIMERS */
+-
+ static struct timespec mtime_to_ts (mtime_t date)
+ {
+     lldiv_t d = lldiv (date, CLOCK_FREQ);
+@@ -233,14 +187,11 @@ void vlc_cond_init (vlc_cond_t *p_condvar)
+ {
+     pthread_condattr_t attr;
+ 
+-    if (unlikely(pthread_condattr_init (&attr)))
+-        abort ();
+-#if (_POSIX_CLOCK_SELECTION > 0)
+-    vlc_clock_setup ();
+-    pthread_condattr_setclock (&attr, vlc_clock_id);
+-#endif
+-    if (unlikely(pthread_cond_init (p_condvar, &attr)))
+    if (unlikely(pthread_condattr_init (&attr))
+     || unlikely(pthread_condattr_setclock(&attr, CLOCK_MONOTONIC))
+     || unlikely(pthread_cond_init (p_condvar, &attr)))
+         abort ();
+
+     pthread_condattr_destroy (&attr);
+ }
+ 
+@@ -625,44 +576,27 @@ void vlc_control_cancel (int cmd, ...)
+ 
+ mtime_t mdate (void)
+ {
+-#if (_POSIX_TIMERS > 0)
+     struct timespec ts;
+ 
+-    vlc_clock_setup ();
+-    if (unlikely(clock_gettime (vlc_clock_id, &ts) != 0))
+    if (unlikely(clock_gettime(CLOCK_MONOTONIC, &ts) != 0))
+         abort ();
+ 
+     return (INT64_C(1000000) * ts.tv_sec) + (ts.tv_nsec / 1000);
+-
+-#else
+-    struct timeval tv;
+-
+-    if (unlikely(gettimeofday (&tv, NULL) != 0))
+-        abort ();
+-    return (INT64_C(1000000) * tv.tv_sec) + tv.tv_usec;
+-
+-#endif
+ }
+ 
+ #undef mwait
+ void mwait (mtime_t deadline)
+ {
+-#if (_POSIX_CLOCK_SELECTION > 0)
+-    vlc_clock_setup ();
+    static pthread_once_t vlc_clock_once = PTHREAD_ONCE_INIT;
+
+     /* If the deadline is already elapsed, or within the clock precision,
+      * do not even bother the system timer. */
+    pthread_once(&vlc_clock_once, vlc_clock_setup_once);
+     deadline -= vlc_clock_prec;
+ 
+     struct timespec ts = mtime_to_ts (deadline);
+ 
+-    while (clock_nanosleep (vlc_clock_id, TIMER_ABSTIME, &ts, NULL) == EINTR);
+-
+-#else
+-    deadline -= mdate ();
+-    if (deadline > 0)
+-        msleep (deadline);
+-
+-#endif
+    while (clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &ts, NULL) == EINTR);
+ }
+ 
+ #undef msleep
+@@ -670,15 +604,7 @@ void msleep (mtime_t delay)
+ {
+     struct timespec ts = mtime_to_ts (delay);
+ 
+-#if (_POSIX_CLOCK_SELECTION > 0)
+-    vlc_clock_setup ();
+-    while (clock_nanosleep (vlc_clock_id, 0, &ts, &ts) == EINTR);
+-
+-#else
+-    while (nanosleep (&ts, &ts) == -1)
+-        assert (errno == EINTR);
+-
+-#endif
+    while (clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts) == EINTR);
+ }
+ 
+ unsigned vlc_GetCPUCount(void)
+-- 
+2.14.4
+
--- a/bsp/buildroot/package/vlc/0007-strerror.patch
+++ b/bsp/buildroot/package/vlc/0007-strerror.patch
@@ -1,43 +0,0 @@
-Fix compile error
-
-  CCLD     vlc
-/home/br/br3/output/build/vlc-2.2.1/src/.libs/libvlccore.so: undefined reference to `strerror_l'
-
-Code for #else condition was taken from
-http://patches.osdyson.org/patch/series/view/vlc/2.2.0~rc2-1+dyson2/dyson.patch
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr vlc-2.2.1.org/configure.ac vlc-2.2.1/configure.ac
--- vlc-2.2.1.org/configure.ac	2015-04-13 09:57:54.000000000 +0200
-+++ vlc-2.2.1/configure.ac	2015-05-02 16:13:22.800448380 +0200
-@@ -534,7 +534,7 @@
- 
- dnl Check for usual libc functions
- AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
-AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale])
-+AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale strerror_l stricmp strnicmp strptime uselocale])
- AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp])
- AC_CHECK_FUNCS(fdatasync,,
-   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
-diff -uNr vlc-2.2.1.org/src/posix/error.c vlc-2.2.1/src/posix/error.c
--- vlc-2.2.1.org/src/posix/error.c	2014-08-14 09:20:04.000000000 +0200
-+++ vlc-2.2.1/src/posix/error.c	2015-05-02 16:25:24.075378369 +0200
-@@ -31,6 +31,7 @@
- 
- static const char *vlc_strerror_l(int errnum, const char *lname)
- {
-+#ifdef HAVE_STRERROR_L
-     int saved_errno = errno;
-     locale_t loc = newlocale(LC_MESSAGES_MASK, lname, (locale_t)0);
- 
-@@ -51,6 +52,9 @@
-     const char *buf = strerror_l(errnum, loc);
- 
-     freelocale(loc);
-+#else
-+    const char *buf = strerror(errnum);
-+#endif
-     return buf;
- }
- 
--- a/bsp/buildroot/package/vlc/0008-Add-support-for-freerdp2.patch
+++ b/bsp/buildroot/package/vlc/0008-Add-support-for-freerdp2.patch
@@ -0,0 +1,150 @@
+From 3780bbb20bf35aa8f21ac672da3f0c5f408468e9 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Thu, 16 Aug 2018 12:27:40 +0200
+Subject: [PATCH] Add support for freerdp2
+
+Downloaded from
+https://gitweb.gentoo.org/repo/gentoo.git/tree/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure.ac         |  2 +-
+ modules/access/rdp.c | 51 ++++++++++++++-------------------------------------
+ 2 files changed, 15 insertions(+), 38 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bfe43512a2..4808b8becf 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1992,7 +1992,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [libvncclient >= 0.9.9], (VNC/rfb client su
+ 
+ dnl  RDP/Remote Desktop access module
+ dnl
+-PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) )
+PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2 >= 1.0.1], (RDP/Remote Desktop client support) )
+ 
+ dnl
+ dnl  Real RTSP plugin
+diff --git a/modules/access/rdp.c b/modules/access/rdp.c
+index 2992090219..49986f5da9 100644
+--- a/modules/access/rdp.c
+++ b/modules/access/rdp.c
+@@ -45,18 +45,6 @@
+ # include <freerdp/version.h>
+ #endif
+ 
+-#if !defined(FREERDP_VERSION_MAJOR) || \
+-    (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)))
+-# define SoftwareGdi sw_gdi
+-# define Fullscreen fullscreen
+-# define ServerHostname hostname
+-# define Username username
+-# define Password password
+-# define ServerPort port
+-# define EncryptionMethods encryption
+-# define ContextSize context_size
+-#endif
+-
+ #include <errno.h>
+ #ifdef HAVE_POLL
+ # include <poll.h>
+@@ -144,6 +132,7 @@ static void desktopResizeHandler( rdpContext *p_context )
+     vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context;
+     demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys;
+     rdpGdi *p_gdi = p_context->gdi;
+    unsigned bytesPerPixel;
+ 
+     if ( p_sys->es )
+     {
+@@ -153,17 +142,21 @@ static void desktopResizeHandler( rdpContext *p_context )
+ 
+     /* Now init and fill es format */
+     vlc_fourcc_t i_chroma;
+-    switch( p_gdi->bytesPerPixel )
+    switch( p_gdi->dstFormat )
+     {
+         default:
+-        case 16:
+            msg_Dbg( p_vlccontext->p_demux, "unhandled dstFormat %x bpp", p_gdi->dstFormat);
+        case PIXEL_FORMAT_BGR16:
+             i_chroma = VLC_CODEC_RGB16;
+            bytesPerPixel = 16;
+             break;
+-        case 24:
+        case PIXEL_FORMAT_BGR24:
+             i_chroma = VLC_CODEC_RGB24;
+            bytesPerPixel = 24;
+             break;
+-        case 32:
+        case PIXEL_FORMAT_BGRA32:
+             i_chroma = VLC_CODEC_RGB32;
+            bytesPerPixel = 32;
+             break;
+     }
+     es_format_t fmt;
+@@ -176,7 +169,7 @@ static void desktopResizeHandler( rdpContext *p_context )
+     fmt.video.i_height = p_gdi->height;
+     fmt.video.i_frame_rate_base = 1000;
+     fmt.video.i_frame_rate = 1000 * p_sys->f_fps;
+-    p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * p_gdi->bytesPerPixel;
+    p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * bytesPerPixel;
+ 
+     if ( p_sys->p_block )
+         p_sys->p_block = block_Realloc( p_sys->p_block, 0, p_sys->i_framebuffersize );
+@@ -237,28 +230,19 @@ static bool postConnectHandler( freerdp *p_instance )
+     vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context;
+ 
+     msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
+-#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))
+              p_instance->settings->DesktopWidth,
+              p_instance->settings->DesktopHeight,
+              p_instance->settings->ColorDepth
+-#else
+-             p_instance->settings->width,
+-             p_instance->settings->height,
+-             p_instance->settings->color_depth
+-#endif
+              );
+ 
+     p_instance->update->DesktopResize = desktopResizeHandler;
+     p_instance->update->BeginPaint = beginPaintHandler;
+     p_instance->update->EndPaint = endPaintHandler;
+ 
+-    gdi_init( p_instance,
+-                CLRBUF_16BPP |
+-#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
+-    !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2))
+-                CLRBUF_24BPP |
+-#endif
+-                CLRBUF_32BPP, NULL );
+    if ( p_instance->settings->ColorDepth > 16 )
+        gdi_init( p_instance, PIXEL_FORMAT_XRGB32);
+    else
+        gdi_init( p_instance, PIXEL_FORMAT_RGB16);
+ 
+     desktopResizeHandler( p_instance->context );
+     return true;
+@@ -432,10 +416,6 @@ static int Open( vlc_object_t *p_this )
+     if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0;
+     p_sys->i_frame_interval = 1000000 / p_sys->f_fps;
+ 
+-#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2
+-    freerdp_channels_global_init();
+-#endif
+-
+     p_sys->p_instance = freerdp_new();
+     if ( !p_sys->p_instance )
+     {
+@@ -508,9 +488,6 @@ static void Close( vlc_object_t *p_this )
+ 
+     freerdp_disconnect( p_sys->p_instance );
+     freerdp_free( p_sys->p_instance );
+-#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2
+-    freerdp_channels_global_uninit();
+-#endif
+ 
+     if ( p_sys->p_block )
+         block_Release( p_sys->p_block );
+-- 
+2.14.4
+
--- a/bsp/buildroot/package/vlc/0008-fix-fallback-code-and-add-required-realtime-library.patch
+++ b/bsp/buildroot/package/vlc/0008-fix-fallback-code-and-add-required-realtime-library.patch
@@ -1,40 +0,0 @@
-From 381bcb7cb03bb602351a323daf3b69b2d4f45e77 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@openadk.org>
-Date: Fri, 26 Aug 2016 15:11:25 +0200
-Subject: [PATCH] fix fallback code and add required realtime library to link
- command
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
- configure.ac       | 1 +
- src/posix/thread.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cb1de25..018c11c 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -121,6 +121,7 @@ case "${host_os}" in
-     ;;
-   linux*)
-     SYS=linux
-+    AC_CHECK_LIB([rt], [posix_spawnp], [VLC_ADD_LIBS([libvlccore],[-lrt])], [], [])
-     ;;
-   bsdi*)
-     SYS=bsdi
-diff --git a/src/posix/thread.c b/src/posix/thread.c
-index 07fa71e..8b8595f 100644
--- a/src/posix/thread.c
-+++ b/src/posix/thread.c
-@@ -85,7 +85,7 @@ static clockid_t vlc_clock_id;
- 
- static void vlc_clock_setup_once (void)
- {
-# if (_POSIX_MONOTONIC_CLOCK == 0)
-+# if (_POSIX_MONOTONIC_CLOCK == 0) && (_POSIX_CLOCK_SELECTION > 0)
-     long val = sysconf (_SC_MONOTONIC_CLOCK);
-     assert (val != 0);
-     vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC;
-- 
-2.1.4
-
--- a/bsp/buildroot/package/vlc/0009-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
+++ b/bsp/buildroot/package/vlc/0009-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
@@ -0,0 +1,50 @@
+From 27635f902831fac898586f1f3dc98369f12582c9 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 26 Aug 2018 12:51:04 +0200
+Subject: [PATCH] configure.ac: also use AC_PATH_PROG to check for
+ wayland-scanner
+
+When cross-compiling the .pc file might point to the wrong
+wayland-scanner binary (target rather than host) resulting in a
+non-executable and wrong scanner.
+Try searching the PATH first, and if that fails fall back into
+pkg-config.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure.ac | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4808b8becf..a18641ed23 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -3140,14 +3140,17 @@ AS_IF([test "${enable_wayland}" != "no"], [
+       AC_MSG_ERROR([$(${PKG_CONFIG} --print-errors 'wayland-protocols >= 1.4')])
+     ])
+ 
+-    AC_MSG_CHECKING([for the Wayland scanner])
+-    PKG_CHECK_EXISTS([wayland-scanner], [
+-      WAYLAND_SCANNER="$(${PKG_CONFIG} wayland-scanner --variable wayland_scanner)"
+-      AC_MSG_RESULT([${WAYLAND_SCANNER}])
+-    ], [
+-      AC_MSG_RESULT([not found])
+-      AC_MSG_ERROR([$(${PKG_CONFIG} --print-errors wayland-scanner)])
+-    ])
+    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
+    if test "x$WAYLAND_SCANNER" = x; then
+        AC_MSG_CHECKING([for the Wayland scanner])
+        PKG_CHECK_EXISTS([wayland-scanner], [
+          WAYLAND_SCANNER="$(${PKG_CONFIG} wayland-scanner --variable wayland_scanner)"
+          AC_MSG_RESULT([${WAYLAND_SCANNER}])
+        ], [
+          AC_MSG_RESULT([not found])
+          AC_MSG_ERROR([$(${PKG_CONFIG} --print-errors wayland-scanner)])
+        ])
+    fi
+ 
+     have_wayland="yes"
+ 
+-- 
+2.18.0
+
--- a/bsp/buildroot/package/vlc/0009-ffmpeg-3.0.patch
+++ b/bsp/buildroot/package/vlc/0009-ffmpeg-3.0.patch
@@ -1,283 +0,0 @@
-Changes for ffmpeg 3.0
-
-This file is a copy of debian/patches/04_ffmpeg-3.0.diff, to be found in
-http://www.deb-multimedia.org/pool/main/v/vlc-dmo/vlc-dmo_2.2.4.orig.tar.gz
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
--- a/configure.ac
-+++ b/configure.ac
-@@ -2324,7 +2324,7 @@ AC_ARG_ENABLE(avcodec,
- AS_IF([test "${enable_avcodec}" != "no"], [
-   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
-     PKG_CHECK_EXISTS([libavutil < 55],, [
-      AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
-+      AC_MSG_WARN([libavutil versions 55 and later are not supported.])
-     ])
-     VLC_SAVE_FLAGS
-     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
-@@ -2334,7 +2334,7 @@ AS_IF([test "${enable_avcodec}" != "no"]
-     VLC_RESTORE_FLAGS
-     have_avcodec="yes"
-   ],[
-    AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.])
-+    AC_MSG_WARN([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.])
-   ])
- ], [
-   have_avcodec="no"
-@@ -2383,7 +2383,7 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
-   case "${avfork}" in
-     ffmpeg)
-       PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-        AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
-+        AC_MSG_WARN([VA API requires FFmpeg libavcodec < 57.10 or libav.])
-       ])
-       ;;
-   esac
-@@ -2417,7 +2417,7 @@ AS_IF([test "${enable_dxva2}" != "no"],
-     case "${avfork}" in
-       ffmpeg)
-         PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-          AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
-+          AC_MSG_WARN([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
-         ])
-         ;;
-     esac
-@@ -2509,7 +2509,7 @@ AS_IF([test "${enable_avformat}" != "no"
-       ])
-       VLC_RESTORE_FLAGS
-     ],[
-      AC_MSG_ERROR([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.])
-+      AC_MSG_WARN([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.])
-   ])
- ])
- AM_CONDITIONAL([HAVE_AVFORMAT], [test "${enable_avformat}" != "no"])
-@@ -2538,7 +2538,7 @@ then
-       ])
-       VLC_RESTORE_FLAGS
-     ],[
-      AC_MSG_ERROR([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.])
-+      AC_MSG_WARN([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.])
-   ])
- fi
- 
-@@ -3181,7 +3181,7 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
-     libav) av_vdpau_ver="55.26.0" ;;
-     ffmpeg) av_vdpau_ver="55.42.100"
-       PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-        AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
-+        AC_MSG_WARN([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
-       ])
-       ;;
-   esac
--- a/modules/codec/avcodec/audio.c
-+++ b/modules/codec/avcodec/audio.c
-@@ -39,7 +39,7 @@
- #include <libavcodec/avcodec.h>
- #include <libavutil/mem.h>
- 
-#include <libavutil/audioconvert.h>
-+#include <libavutil/channel_layout.h>
- 
- #include "avcodec.h"
- 
--- a/modules/codec/avcodec/video.c
-+++ b/modules/codec/avcodec/video.c
-@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
- static int  ffmpeg_GetFrameBuf    ( struct AVCodecContext *, AVFrame * );
- static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
- #endif
-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
-                                          const enum PixelFormat * );
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
-+                                          const enum AVPixelFormat * );
- 
- static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
- {
-@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
-     p_sys->p_codec = p_codec;
-     p_sys->i_codec_id = i_codec_id;
-     p_sys->psz_namecodec = psz_namecodec;
-    p_sys->p_ff_pic = avcodec_alloc_frame();
-+    p_sys->p_ff_pic = av_frame_alloc();
-     p_sys->b_delayed_open = true;
-     p_sys->p_va = NULL;
-     vlc_sem_init( &p_sys->sem_mt, 0 );
-@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
-     if( ffmpeg_OpenCodec( p_dec ) < 0 )
-     {
-         msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
-        avcodec_free_frame( &p_sys->p_ff_pic );
-+        av_frame_free( &p_sys->p_ff_pic );
-         vlc_sem_destroy( &p_sys->sem_mt );
-         free( p_sys );
-         return VLC_EGENERIC;
-@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
-     wait_mt( p_sys );
- 
-     if( p_sys->p_ff_pic )
-        avcodec_free_frame( &p_sys->p_ff_pic );
-+        av_frame_free( &p_sys->p_ff_pic );
- 
-     if( p_sys->p_va )
-         vlc_va_Delete( p_sys->p_va );
-@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
- }
- #endif
- 
-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-                                          const enum PixelFormat *pi_fmt )
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-+                                          const enum AVPixelFormat *pi_fmt )
- {
-     decoder_t *p_dec = p_context->opaque;
-     decoder_sys_t *p_sys = p_dec->p_sys;
--- a/modules/codec/avcodec/encoder.c
-+++ b/modules/codec/avcodec/encoder.c
-@@ -41,7 +41,7 @@
- #include <vlc_cpu.h>
- 
- #include <libavcodec/avcodec.h>
-#include <libavutil/audioconvert.h>
-+#include <libavutil/channel_layout.h>
- 
- #include "avcodec.h"
- #include "avcommon.h"
-@@ -311,7 +311,7 @@ int OpenEncoder( vlc_object_t *p_this )
-     else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
-                              &psz_namecodec ) )
-     {
-        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
-+        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
-             return VLC_EGENERIC; /* handed chroma output */
- 
-         i_cat      = VIDEO_ES;
-@@ -555,7 +555,7 @@ int OpenEncoder( vlc_object_t *p_this )
- 
-         if( p_codec->pix_fmts )
-         {
-            const enum PixelFormat *p = p_codec->pix_fmts;
-+            const enum AVPixelFormat *p = p_codec->pix_fmts;
-             for( ; *p != -1; p++ )
-             {
-                 if( *p == p_context->pix_fmt ) break;
-@@ -1017,7 +1017,7 @@ errmsg:
-         }
-     }
- 
-    p_sys->frame = avcodec_alloc_frame();
-+    p_sys->frame = av_frame_alloc();
-     if( !p_sys->frame )
-     {
-         goto error;
-@@ -1048,7 +1048,7 @@ static void vlc_av_packet_Release(block_
- {
-     vlc_av_packet_t *b = (void *) block;
- 
-    av_free_packet(&b->packet);
-+    av_packet_unref(&b->packet);
-     free(b);
- }
- 
-@@ -1088,7 +1088,7 @@ static block_t *EncodeVideo( encoder_t *
-     AVFrame *frame = NULL;
-     if( likely(p_pict) ) {
-         frame = p_sys->frame;
-        avcodec_get_frame_defaults( frame );
-+        av_frame_unref( frame );
-         for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
-         {
-             p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
-@@ -1188,7 +1188,7 @@ static block_t *EncodeVideo( encoder_t *
-             av_pkt.duration / p_sys->p_context->time_base.den, p_sys->p_context );
-     if( unlikely(p_block == NULL) )
-     {
-        av_free_packet( &av_pkt );
-+        av_packet_unref( &av_pkt );
-         return NULL;
-     }
- 
-@@ -1329,7 +1329,7 @@ static block_t *handle_delay_buffer( enc
-     //How much we need to copy from new packet
-     const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
- 
-    avcodec_get_frame_defaults( p_sys->frame );
-+    av_frame_unref( p_sys->frame );
-     p_sys->frame->format     = p_sys->p_context->sample_fmt;
-     p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
- 
-@@ -1451,7 +1451,7 @@ static block_t *EncodeAudio( encoder_t *
-     while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
-            ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
-     {
-        avcodec_get_frame_defaults( p_sys->frame );
-+        av_frame_unref( p_sys->frame );
-         if( p_sys->b_variable )
-             p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
-         else
-@@ -1514,7 +1514,7 @@ void CloseEncoder( vlc_object_t *p_this
-     encoder_t *p_enc = (encoder_t *)p_this;
-     encoder_sys_t *p_sys = p_enc->p_sys;
- 
-    /*FIXME: we should use avcodec_free_frame, but we don't require so new avcodec that has it*/
-+    /*FIXME: we should use av_frame_free, but we don't require so new avcodec that has it*/
-     av_freep( &p_sys->frame );
- 
-     vlc_avcodec_lock();
--- a/modules/demux/avformat/demux.c
-+++ b/modules/demux/avformat/demux.c
-@@ -734,14 +734,14 @@ static int Demux( demux_t *p_demux )
-     }
-     if( pkt.stream_index < 0 || pkt.stream_index >= p_sys->i_tk )
-     {
-        av_free_packet( &pkt );
-+        av_packet_unref( &pkt );
-         return 1;
-     }
-     const AVStream *p_stream = p_sys->ic->streams[pkt.stream_index];
-     if( p_stream->time_base.den <= 0 )
-     {
-         msg_Warn( p_demux, "Invalid time base for the stream %d", pkt.stream_index );
-        av_free_packet( &pkt );
-+        av_packet_unref( &pkt );
-         return 1;
-     }
-     if( p_stream->codec->codec_id == AV_CODEC_ID_SSA )
-@@ -749,7 +749,7 @@ static int Demux( demux_t *p_demux )
-         p_frame = BuildSsaFrame( &pkt, p_sys->i_ssa_order++ );
-         if( !p_frame )
-         {
-            av_free_packet( &pkt );
-+            av_packet_unref( &pkt );
-             return 1;
-         }
-     }
-@@ -757,7 +757,7 @@ static int Demux( demux_t *p_demux )
-     {
-         if( ( p_frame = block_Alloc( pkt.size ) ) == NULL )
-         {
-            av_free_packet( &pkt );
-+            av_packet_unref( &pkt );
-             return 0;
-         }
-         memcpy( p_frame->p_buffer, pkt.data, pkt.size );
-@@ -838,7 +838,7 @@ static int Demux( demux_t *p_demux )
-     else
-         block_Release( p_frame );
- 
-    av_free_packet( &pkt );
-+    av_packet_unref( &pkt );
-     return 1;
- }
- 
--- a/modules/codec/avcodec/vaapi.c
-+++ b/modules/codec/avcodec/vaapi.c
-@@ -595,7 +595,7 @@ static int Create( vlc_va_t *p_va, AVCod
-         return err;
- 
-     /* Only VLD supported */
-    p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
-+    p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
-     p_va->setup = Setup;
-     p_va->get = Get;
-     p_va->release = Release;
--- a/bsp/buildroot/package/vlc/0010-static-assert.patch
+++ b/bsp/buildroot/package/vlc/0010-static-assert.patch
@@ -1,25 +0,0 @@
-From: Thomas Guillem <thomas@gllm.fr>
-Date: Thu, 30 Apr 2015 13:29:50 +0000 (+0200)
-Subject: Fix build when using C99 and C++11
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=51ce6cdaf598754e617900994c1943c6cba6d604
-
-Fix build when using C99 and C++11
-
-Indeed, C99 doesn't have static_assert and C++11 has it.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
-
-diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
-index b949d24..ee168d7 100644
--- a/include/vlc_fixups.h
-+++ b/include/vlc_fixups.h
-@@ -239,7 +239,7 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
- }
- #endif
- 
-#if !defined (HAVE_STATIC_ASSERT)
-+#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert)
- # define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
- # define static_assert _Static_assert
- #endif
--- a/bsp/buildroot/package/vlc/0011-static-assert.patch
+++ b/bsp/buildroot/package/vlc/0011-static-assert.patch
@@ -1,28 +0,0 @@
-From: Thomas Guillem <thomas@gllm.fr>
-Date: Mon, 14 Dec 2015 09:08:25 +0000 (+0100)
-Subject: compat: fix static_assert
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=6faf9066670db6e0d241ead6a3926b2d9cc6a041
-
-compat: fix static_assert
-
-It was not possible to use it outside of functions.
-
-Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
-
-diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
-index 213d3f3..bd798d0 100644
--- a/include/vlc_fixups.h
-+++ b/include/vlc_fixups.h
-@@ -273,7 +273,9 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
- #endif
- 
- #if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert)
-# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
-+# define STATIC_ASSERT_CONCAT_(a, b) a##b
-+# define STATIC_ASSERT_CONCAT(a, b) STATIC_ASSERT_CONCAT_(a, b)
-+# define _Static_assert(x, s) extern char STATIC_ASSERT_CONCAT(static_assert_, __LINE__)[sizeof(struct { unsigned:-!(x); })]
- # define static_assert _Static_assert
- #endif
- 
--- a/bsp/buildroot/package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patch
+++ b/bsp/buildroot/package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patch
@@ -1,64 +0,0 @@
-From 0c8d631f4f9fa24f1bbd56a4dbe9d6f1e2360685 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 17 Dec 2017 12:26:33 +0100
-Subject: [PATCH] Fix build with libupnp above 1.6.23
-
-Starting from this release, libupnp has its own compat functions,
-backport patch from mainstream:
-https://github.com/videolan/vlc/commit/f9c5a343f1a8cad9c2c153f9c05e4e7201675a43#diff-2e66eb8b4fb06845a6426bd4a541d2f7
-
-Move UpnpEventPtr declaration in upnp.hpp as done in:
-https://github.com/videolan/vlc/commit/3eb4e03512f45c1fa27c7f9a6759e8e7d3905720#diff-ac39568c5e5e1c68776a93dfe0b3c1e6
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
- modules/services_discovery/upnp.cpp | 5 +----
- modules/services_discovery/upnp.hpp | 6 ++++++
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
-index 9b6ed8727a..cf846602b8 100644
--- a/modules/services_discovery/upnp.cpp
-+++ b/modules/services_discovery/upnp.cpp
-@@ -40,11 +40,10 @@
- #include <assert.h>
- #include <limits.h>
- 
-#if UPNP_VERSION < 10800
-+#if UPNP_VERSION < 10623
- /*
-  * Compat functions and typedefs for libupnp prior to 1.8
-  */
-typedef void* UpnpEventPtr;
- typedef Upnp_Discovery UpnpDiscovery;
- typedef Upnp_Action_Complete UpnpActionComplete;
- typedef Upnp_Event UpnpEvent;
-@@ -74,8 +73,6 @@ static const char* UpnpEventSubscribe_get_SID_cstr( const UpnpEventSubscribe* p_
- {
-   return p_s->Sid;
- }
-#else
-typedef const void* UpnpEventPtr;
- #endif
- 
- /*
-diff --git a/modules/services_discovery/upnp.hpp b/modules/services_discovery/upnp.hpp
-index 23fe4db9ab..c369a04da6 100644
--- a/modules/services_discovery/upnp.hpp
-+++ b/modules/services_discovery/upnp.hpp
-@@ -33,6 +33,12 @@
- 
- #include <vlc_common.h>
- 
-+#if UPNP_VERSION < 10800
-+typedef void* UpnpEventPtr;
-+#else
-+typedef const void* UpnpEventPtr;
-+#endif
-+
- // Classes
- class Container;
- 
-- 
-2.14.1
-
--- a/bsp/buildroot/package/vlc/Config.in
+++ b/bsp/buildroot/package/vlc/Config.in
@@ -1,14 +1,10 @@
-if BR2_PACKAGE_VLC
-comment "vlc is known not to work in all configurations"
-comment "If you can fix it, please inform buildroot@buildroot.org"
-endif
-
 config BR2_PACKAGE_VLC
 	bool "vlc"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
 	select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS
@@ -32,7 +28,9 @@ config BR2_PACKAGE_VLC_OPENCV3_BACKEND
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT

-comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, headers >= 3.7"
+comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, gcc >= 4.9, headers >= 3.7"
 	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR \
-		|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
+	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS \
+		|| !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \
+		|| !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
--- a/bsp/buildroot/package/vlc/vlc.hash
+++ b/bsp/buildroot/package/vlc/vlc.hash
@@ -1,8 +1,9 @@
-# From http://download.videolan.org/pub/videolan/vlc/2.2.8/vlc-2.2.8.tar.xz.sha256
-sha256 9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec vlc-2.2.8.tar.xz
-# From http://download.videolan.org/pub/videolan/vlc/2.2.8/vlc-2.2.8.tar.xz.sha1
-sha1 b960ec5bdb9a51da285430fc68962927ccc87187 vlc-2.2.8.tar.xz
-# From http://download.videolan.org/pub/videolan/vlc/2.2.8/vlc-2.2.8.tar.xz.md5
-md5 b721fddf65aaf64eeee5629aa9bf7c9e vlc-2.2.8.tar.xz
+# From http://download.videolan.org/pub/videolan/vlc/3.0.6/vlc-3.0.6.tar.xz.sha256
+sha256 18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3 vlc-3.0.6.tar.xz
+# From http://download.videolan.org/pub/videolan/vlc/3.0.6/vlc-3.0.6.tar.xz.sha1
+sha1 b35168c1811b07844d861311bd0f2194f4bb82ac vlc-3.0.6.tar.xz
+# From http://download.videolan.org/pub/videolan/vlc/3.0.6/vlc-3.0.6.tar.xz.md5
+md5 4ff71d262e070fd19f86a1c3542c7b4e vlc-3.0.6.tar.xz
+# Locally computed
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
--- a/bsp/buildroot/package/vlc/vlc.mk
+++ b/bsp/buildroot/package/vlc/vlc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-VLC_VERSION = 2.2.8
+VLC_VERSION = 3.0.6
 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION)
 VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
 VLC_LICENSE = GPL-2.0+, LGPL-2.1+
@@ -17,11 +17,15 @@ VLC_INSTALL_STAGING = YES

 # gcc bug internal compiler error: in merge_overlapping_regs, at
 # regrename.c:304. This bug is fixed since gcc 6.
-ifeq ($(BR2_microblaze):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:)
+ifeq ($(BR2_microblaze)$(BR2_or1k):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:)
 VLC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0"
 VLC_CONF_OPTS += --disable-optimizations
 endif

+# configure check for -fstack-protector-strong is broken
+VLC_CONF_ENV += \
+	ax_cv_check_cflags___fstack_protector_strong=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no)
+
 # VLC defines two autoconf functions which are also defined by our own pkg.m4
 # from pkgconf. Unfortunately, they are defined in a different way: VLC adds
 # --enable- options, but pkg.m4 adds --with- options. To make sure we use
@@ -34,33 +38,53 @@ endef
 VLC_POST_PATCH_HOOKS += VLC_OVERRIDE_PKG_M4

 VLC_CONF_OPTS += \
-	--disable-gles1 \
 	--disable-a52 \
-	--disable-shout \
-	--disable-twolame \
-	--disable-dca \
-	--disable-schroedinger \
-	--disable-fluidsynth \
-	--disable-zvbi \
-	--disable-kate \
-	--disable-caca \
-	--disable-jack \
-	--disable-samplerate \
-	--disable-chromaprint \
-	--disable-goom \
-	--disable-projectm \
-	--disable-vsxu \
-	--disable-mtp \
-	--disable-mmal-codec \
-	--disable-mmal-vout \
-	--disable-dvdnav \
-	--disable-vpx \
-	--disable-jpeg \
-	--disable-x262 \
-	--disable-x265 \
-	--disable-mfx \
-	--disable-vdpau \
 	--disable-addonmanagermodules \
+	--disable-aom \
+	--disable-aribb25 \
+	--disable-aribsub \
+	--disable-asdcp \
+	--disable-bpg \
+	--disable-caca \
+	--disable-chromaprint \
+	--disable-chromecast \
+	--disable-crystalhd \
+	--disable-dc1394 \
+	--disable-dca \
+	--disable-decklink \
+	--disable-dsm \
+	--disable-dv1394 \
+	--disable-fluidlite \
+	--disable-fluidsynth \
+	--disable-gme \
+	--disable-goom \
+	--disable-jack \
+	--disable-jpeg \
+	--disable-kai \
+	--disable-kate \
+	--disable-kva \
+	--disable-libplacebo \
+	--disable-linsys \
+	--disable-mfx \
+	--disable-microdns \
+	--disable-mmal \
+	--disable-mtp \
+	--disable-notify \
+	--disable-projectm \
+	--disable-schroedinger \
+	--disable-shine \
+	--disable-shout \
+	--disable-sndio \
+	--disable-spatialaudio \
+	--disable-srt \
+	--disable-telx \
+	--disable-tiger \
+	--disable-twolame \
+	--disable-vdpau \
+	--disable-vsxu \
+	--disable-wasapi \
+	--disable-x262 \
+	--disable-zvbi \
 	--enable-run-as-root

 # Uses __atomic_fetch_add_4
@@ -92,12 +116,12 @@ else
 VLC_CONF_OPTS += --disable-alsa
 endif

-# bonjour support needs avahi-client, which needs avahi-daemon and dbus
+# avahi support needs avahi-client, which needs avahi-daemon and dbus
 ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy)
-VLC_CONF_OPTS += --enable-bonjour
-VLC_DEPENDENCIES += avahi dbus
+VLC_CONF_OPTS += --enable-avahi
+VLC_DEPENDENCIES += avahi
 else
-VLC_CONF_OPTS += --disable-bonjour
+VLC_CONF_OPTS += --disable-avahi
 endif

 ifeq ($(BR2_PACKAGE_DBUS),y)
@@ -107,14 +131,6 @@ else
 VLC_CONF_OPTS += --disable-dbus
 endif

-ifeq ($(BR2_PACKAGE_DIRECTFB),y)
-VLC_CONF_OPTS += --enable-directfb
-VLC_CONF_ENV += ac_cv_path_DIRECTFB_CONFIG=$(STAGING_DIR)/usr/bin/directfb-config
-VLC_DEPENDENCIES += directfb
-else
-VLC_CONF_OPTS += --disable-directfb
-endif
-
 ifeq ($(BR2_PACKAGE_FAAD2),y)
 VLC_CONF_OPTS += --enable-faad
 VLC_DEPENDENCIES += faad2
@@ -149,13 +165,30 @@ VLC_CONF_OPTS += --disable-flac
 endif

 ifeq ($(BR2_PACKAGE_FREERDP),y)
+VLC_CONF_OPTS += --enable-freerdp
 VLC_DEPENDENCIES += freerdp
+else
+VLC_CONF_OPTS += --disable-freerdp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
+VLC_CONF_OPTS += --enable-gst-decode
+VLC_DEPENDENCIES += gst1-plugins-base
+else
+VLC_CONF_OPTS += --disable-gst-decode
 endif

 ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
 VLC_DEPENDENCIES += libgl
 endif

+ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
+VLC_CONF_OPTS += --enable-harfbuzz
+VLC_DEPENDENCIES += harfbuzz
+else
+VLC_CONF_OPTS += --disable-harfbuzz
+endif
+
 ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
 VLC_CONF_OPTS += --enable-gles2
 VLC_DEPENDENCIES += libgles
@@ -181,6 +214,13 @@ else
 VLC_CONF_OPTS += --disable-opus
 endif

+ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
+VLC_CONF_OPTS += --enable-archive
+VLC_DEPENDENCIES += libarchive
+else
+VLC_CONF_OPTS += --disable-archive
+endif
+
 ifeq ($(BR2_PACKAGE_LIBASS),y)
 VLC_CONF_OPTS += --enable-libass
 VLC_DEPENDENCIES += libass
@@ -209,6 +249,20 @@ else
 VLC_CONF_OPTS += --disable-dvbpsi
 endif

+ifeq ($(BR2_PACKAGE_LIBDVDNAV),y)
+VLC_CONF_OPTS += --enable-dvdnav
+VLC_DEPENDENCIES += libdvdnav
+else
+VLC_CONF_OPTS += --disable-dvdnav
+endif
+
+ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
+VLC_CONF_OPTS += --enable-dvdread
+VLC_DEPENDENCIES += libdvdread
+else
+VLC_CONF_OPTS += --disable-dvdread
+endif
+
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 VLC_CONF_OPTS += --enable-libgcrypt
 VLC_DEPENDENCIES += libgcrypt
@@ -218,6 +272,10 @@ else
 VLC_CONF_OPTS += --disable-libgcrypt
 endif

+ifeq ($(BR2_PACKAGE_LIBIDN),y)
+VLC_DEPENDENCIES += libidn
+endif
+
 ifeq ($(BR2_PACKAGE_LIBMAD),y)
 VLC_CONF_OPTS += --enable-mad
 VLC_DEPENDENCIES += libmad
@@ -226,10 +284,10 @@ VLC_CONF_OPTS += --disable-mad
 endif

 ifeq ($(BR2_PACKAGE_LIBMATROSKA),y)
-VLC_CONF_OPTS += --enable-mkv
+VLC_CONF_OPTS += --enable-matroska
 VLC_DEPENDENCIES += libmatroska
 else
-VLC_CONF_OPTS += --disable-mkv
+VLC_CONF_OPTS += --disable-matroska
 endif

 ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
@@ -246,6 +304,13 @@ else
 VLC_CONF_OPTS += --disable-libmpeg2
 endif

+ifeq ($(BR2_PACKAGE_LIBNFS),y)
+VLC_CONF_OPTS += --enable-nfs
+VLC_DEPENDENCIES += libnfs
+else
+VLC_CONF_OPTS += --disable-nfs
+endif
+
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 VLC_CONF_OPTS += --enable-png
 VLC_DEPENDENCIES += libpng
@@ -260,6 +325,27 @@ else
 VLC_CONF_OPTS += --disable-svg --disable-svgdec
 endif

+ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
+VLC_CONF_OPTS += --enable-samplerate
+VLC_DEPENDENCIES += libsamplerate
+else
+VLC_CONF_OPTS += --disable-samplerate
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSECRET),y)
+VLC_CONF_OPTS += --enable-secret
+VLC_DEPENDENCIES += libsecret
+else
+VLC_CONF_OPTS += --disable-secret
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSOXR),y)
+VLC_CONF_OPTS += --enable-soxr
+VLC_DEPENDENCIES += libsoxr
+else
+VLC_CONF_OPTS += --disable-soxr
+endif
+
 ifeq ($(BR2_PACKAGE_LIBSSH2),y)
 VLC_CONF_OPTS += --enable-sftp
 VLC_DEPENDENCIES += libssh2
@@ -288,6 +374,14 @@ else
 VLC_CONF_OPTS += --disable-upnp
 endif

+# libva support depends on ffmpeg
+ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBVA),yy)
+VLC_CONF_OPTS += --enable-libva
+VLC_DEPENDENCIES += libva
+else
+VLC_CONF_OPTS += --disable-libva
+endif
+
 ifeq ($(BR2_PACKAGE_LIBVNCSERVER),y)
 VLC_CONF_OPTS += --enable-vnc
 VLC_DEPENDENCIES += libvncserver
@@ -309,6 +403,13 @@ else
 VLC_CONF_OPTS += --disable-v4l2
 endif

+ifeq ($(BR2_PACKAGE_LIBVPX),y)
+VLC_CONF_OPTS += --enable-vpx
+VLC_DEPENDENCIES += libvpx
+else
+VLC_CONF_OPTS += --disable-vpx
+endif
+
 ifeq ($(BR2_PACKAGE_LIBXCB),y)
 VLC_CONF_OPTS += --enable-xcb
 VLC_DEPENDENCIES += libxcb
@@ -326,14 +427,6 @@ endif
 ifeq ($(BR2_PACKAGE_LIVE555),y)
 VLC_CONF_OPTS += --enable-live555
 VLC_DEPENDENCIES += live555
-VLC_CONF_ENV += \
-	LIVE555_CFLAGS="\
-		-I$(STAGING_DIR)/usr/include/BasicUsageEnvironment \
-		-I$(STAGING_DIR)/usr/include/groupsock \
-		-I$(STAGING_DIR)/usr/include/liveMedia \
-		-I$(STAGING_DIR)/usr/include/UsageEnvironment \
-		" \
-	LIVE555_LIBS="-L$(STAGING_DIR)/usr/lib -lliveMedia"
 else
 VLC_CONF_OPTS += --disable-live555
 endif
@@ -349,6 +442,13 @@ ifeq ($(BR2_PACKAGE_MINIZIP),y)
 VLC_DEPENDENCIES += minizip
 endif

+ifeq ($(BR2_PACKAGE_MPG123),y)
+VLC_CONF_OPTS += --enable-mpg123
+VLC_DEPENDENCIES += mpg123
+else
+VLC_CONF_OPTS += --disable-mpg123
+endif
+
 ifeq ($(BR2_PACKAGE_MUSEPACK),y)
 VLC_CONF_OPTS += --enable-mpc
 VLC_DEPENDENCIES += musepack
@@ -356,22 +456,31 @@ else
 VLC_CONF_OPTS += --disable-mpc
 endif

-ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-VLC_CONF_OPTS += --enable-qt
-VLC_CONF_ENV += \
-	ac_cv_path_MOC=$(HOST_DIR)/bin/moc \
-	ac_cv_path_RCC=$(HOST_DIR)/bin/rcc \
-	ac_cv_path_UIC=$(HOST_DIR)/bin/uic
-VLC_DEPENDENCIES += qt
+ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
+VLC_CONF_OPTS += --enable-ncurses
+VLC_DEPENDENCIES += ncurses
 else
-VLC_CONF_OPTS += --disable-qt
+VLC_CONF_OPTS += --disable-ncurses
 endif

-ifeq ($(BR2_PACKAGE_SDL_X11),y)
-VLC_CONF_OPTS += --enable-sdl
-VLC_DEPENDENCIES += sdl
+ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
+VLC_CONF_OPTS += --enable-pulse
+VLC_DEPENDENCIES += pulseaudio
 else
-VLC_CONF_OPTS += --disable-sdl
+VLC_CONF_OPTS += --disable-pulse
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS)$(BR2_PACKAGE_QT5SVG),yy)
+VLC_CONF_OPTS += --enable-qt
+VLC_DEPENDENCIES += qt5base qt5svg
+ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT)$(BR2_PACKAGE_XLIB_LIBXINERAMA)$(BR2_PACKAGE_XLIB_LIBXPM),yyy)
+VLC_CONF_OPTS += --enable-skins2
+VLC_DEPENDENCIES += xlib_libXext xlib_libXinerama xlib_libXpm
+else
+VLC_CONF_OPTS += --disable-skins2
+endif
+else
+VLC_CONF_OPTS += --disable-qt --disable-skins2
 endif

 ifeq ($(BR2_PACKAGE_SDL_IMAGE),y)
@@ -381,9 +490,16 @@ else
 VLC_CONF_OPTS += --disable-sdl-image
 endif

-ifeq ($(BR2_PACKAGE_SPEEX),y)
+ifeq ($(BR2_PACKAGE_SAMBA4),y)
+VLC_CONF_OPTS += --enable-smbclient
+VLC_DEPENDENCIES += samba4
+else
+VLC_CONF_OPTS += --disable-smbclient
+endif
+
+ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy)
 VLC_CONF_OPTS += --enable-speex
-VLC_DEPENDENCIES += speex
+VLC_DEPENDENCIES += speex speexdsp
 else
 VLC_CONF_OPTS += --disable-speex
 endif
@@ -409,11 +525,29 @@ else
 VLC_CONF_OPTS += --disable-udev
 endif

-ifeq ($(BR2_PACKAGE_XCB_UTIL_KEYSYMS),y)
-VLC_CONF_OPTS += --enable-xcb
-VLC_DEPENDENCIES += xcb-util-keysyms
+ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WAYLAND_PROTOCOLS),yy)
+VLC_CONF_OPTS += --enable-wayland
+VLC_DEPENDENCIES += wayland wayland-protocols
 else
-VLC_CONF_OPTS += --disable-xcb
+VLC_CONF_OPTS += --disable-wayland
+endif
+
+ifeq ($(BR2_PACKAGE_X264),y)
+VLC_CONF_OPTS += --enable-x264
+VLC_DEPENDENCIES += x264
+else
+VLC_CONF_OPTS += --disable-x264
+endif
+
+ifeq ($(BR2_PACKAGE_X265),y)
+VLC_CONF_OPTS += --enable-x265
+VLC_DEPENDENCIES += x265
+else
+VLC_CONF_OPTS += --disable-x265
+endif
+
+ifeq ($(BR2_PACKAGE_XCB_UTIL_KEYSYMS),y)
+VLC_DEPENDENCIES += xcb-util-keysyms
 endif

 ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)