Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
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
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
Backport from: https://git.videolan.org/?p=vlc.git;a=commit;h=cc236e4652255902f2c2cee3b18f83367f35a8c7
|
||||
|
||||
From cc236e4652255902f2c2cee3b18f83367f35a8c7 Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Martin <s.martin49@gmail.com>
|
||||
Date: Sun, 24 May 2015 14:30:09 +0200
|
||||
Subject: [PATCH 8/9] opencv_wrapper: use opencv2-style includes
|
||||
|
||||
If old opencv1-style legacy include directory is available, this change
|
||||
becomes purely cosmetic (maybe will compile a bit faster).
|
||||
It becomes an FTBFS fix when opencv1-style include directory is missing
|
||||
(i.e. from opencv-3.0).
|
||||
|
||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
|
||||
---
|
||||
modules/video_filter/opencv_wrapper.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
|
||||
index e36e1a5..5d74241 100644
|
||||
--- a/modules/video_filter/opencv_wrapper.c
|
||||
+++ b/modules/video_filter/opencv_wrapper.c
|
||||
@@ -39,8 +39,8 @@
|
||||
#include <vlc_image.h>
|
||||
#include "filter_picture.h"
|
||||
|
||||
-#include <cxcore.h>
|
||||
-#include <cv.h>
|
||||
+#include <opencv2/core/core_c.h>
|
||||
+#include <opencv2/core/types_c.h>
|
||||
|
||||
/*****************************************************************************
|
||||
* Local prototypes
|
||||
--
|
||||
2.4.2
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
Backport from: https://git.videolan.org/?p=vlc.git;a=commit;h=b82416d7000a993b33e903095a590fe32212a85e
|
||||
|
||||
From b82416d7000a993b33e903095a590fe32212a85e Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Martin <s.martin49@gmail.com>
|
||||
Date: Sun, 24 May 2015 14:30:10 +0200
|
||||
Subject: [PATCH 9/9] opencv_example: add missing #include statements
|
||||
|
||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
|
||||
---
|
||||
modules/video_filter/opencv_example.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
|
||||
index ae3af05..998f286 100644
|
||||
--- a/modules/video_filter/opencv_example.cpp
|
||||
+++ b/modules/video_filter/opencv_example.cpp
|
||||
@@ -41,6 +41,8 @@
|
||||
|
||||
#include <opencv2/core/core_c.h>
|
||||
#include <opencv2/core/core.hpp>
|
||||
+#include <opencv2/imgproc/imgproc_c.h>
|
||||
+#include <opencv2/imgproc/imgproc.hpp>
|
||||
#include <opencv2/objdetect/objdetect.hpp>
|
||||
|
||||
/*****************************************************************************
|
||||
--
|
||||
2.4.2
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://download.videolan.org/pub/videolan/vlc/2.2.1/vlc-2.2.1.tar.xz.sha256
|
||||
sha256 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb vlc-2.2.1.tar.xz
|
||||
# From http://download.videolan.org/pub/videolan/vlc/2.2.3/vlc-2.2.3.tar.xz.sha256
|
||||
sha256 1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be vlc-2.2.4.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
VLC_VERSION = 2.2.1
|
||||
VLC_VERSION = 2.2.4
|
||||
VLC_SITE = http://get.videolan.org/vlc/$(VLC_VERSION)
|
||||
VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
|
||||
VLC_LICENSE = GPLv2+ LGPLv2.1+
|
||||
@@ -137,10 +137,7 @@ VLC_CONF_OPTS += --disable-flac
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FREERDP),y)
|
||||
VLC_CONF_OPTS += --enable-freerdp
|
||||
VLC_DEPENDENCIES += freerdp
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-libfreerdp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
|
||||
@@ -186,6 +183,13 @@ else
|
||||
VLC_CONF_OPTS += --disable-bluray
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCDDB),y)
|
||||
VLC_CONF_OPTS += --enable-libcddb
|
||||
VLC_DEPENDENCIES += libcddb
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-libcddb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBDVBPSI),y)
|
||||
VLC_CONF_OPTS += --enable-dvbpsi
|
||||
VLC_DEPENDENCIES += libdvbpsi
|
||||
@@ -244,6 +248,13 @@ else
|
||||
VLC_CONF_OPTS += --disable-svg --disable-svgdec
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSSH2),y)
|
||||
VLC_CONF_OPTS += --enable-sftp
|
||||
VLC_DEPENDENCIES += libssh2
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-sftp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSIDPLAY2),y)
|
||||
VLC_CONF_OPTS += --enable-sid
|
||||
VLC_DEPENDENCIES += libsidplay2
|
||||
@@ -265,6 +276,13 @@ else
|
||||
VLC_CONF_OPTS += --disable-upnp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBVNCSERVER),y)
|
||||
VLC_CONF_OPTS += --enable-vnc
|
||||
VLC_DEPENDENCIES += libvncserver
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-vnc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
|
||||
VLC_CONF_OPTS += --enable-vorbis
|
||||
VLC_DEPENDENCIES += libvorbis
|
||||
@@ -315,6 +333,17 @@ else
|
||||
VLC_CONF_OPTS += --disable-lua
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MINIZIP),y)
|
||||
VLC_DEPENDENCIES += minizip
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MUSEPACK),y)
|
||||
VLC_CONF_OPTS += --enable-mpc
|
||||
VLC_DEPENDENCIES += musepack
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-mpc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
|
||||
VLC_CONF_OPTS += --enable-qt
|
||||
VLC_CONF_ENV += \
|
||||
@@ -368,6 +397,13 @@ else
|
||||
VLC_CONF_OPTS += --disable-udev
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XCB_UTIL_KEYSYMS),y)
|
||||
VLC_CONF_OPTS += --enable-xcb
|
||||
VLC_DEPENDENCIES += xcb-util-keysyms
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-xcb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
|
||||
VLC_CONF_OPTS += --with-x
|
||||
VLC_DEPENDENCIES += xlib_libX11
|
||||
|
||||
Reference in New Issue
Block a user