Bump buildroot to 2019.02
This commit is contained in:
@@ -1,39 +0,0 @@
|
||||
From abfe3e7b2b4af1de9b891f3a7a996b70533b0a27 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sun, 4 Mar 2018 09:07:51 +0100
|
||||
Subject: [PATCH] libdvbv5: add optional copy of TEMP_FAILURE_RETRY macro (fix
|
||||
musl compile)
|
||||
|
||||
Fixes:
|
||||
|
||||
../../lib/libdvbv5/.libs/libdvbv5.so: undefined reference to `TEMP_FAILURE_RETRY'
|
||||
|
||||
[Upstream: https://www.mail-archive.com/linux-media@vger.kernel.org/msg127134.html]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
lib/libdvbv5/dvb-dev-local.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/lib/libdvbv5/dvb-dev-local.c b/lib/libdvbv5/dvb-dev-local.c
|
||||
index 8bc99d1..7a76d65 100644
|
||||
--- a/lib/libdvbv5/dvb-dev-local.c
|
||||
+++ b/lib/libdvbv5/dvb-dev-local.c
|
||||
@@ -44,6 +44,15 @@
|
||||
# define _(string) string
|
||||
#endif
|
||||
|
||||
+/* taken from glibc unistd.h */
|
||||
+#ifndef TEMP_FAILURE_RETRY
|
||||
+#define TEMP_FAILURE_RETRY(expression) \
|
||||
+ ({ long int __result; \
|
||||
+ do __result = (long int) (expression); \
|
||||
+ while (__result == -1L && errno == EINTR); \
|
||||
+ __result; })
|
||||
+#endif
|
||||
+
|
||||
struct dvb_dev_local_priv {
|
||||
dvb_dev_change_t notify_dev_change;
|
||||
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
From 21d7082c635433176aebcd9d6f0177edb059f41f Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 17 Nov 2018 21:26:57 +0100
|
||||
Subject: [PATCH] v4l2-compliance needs fork
|
||||
|
||||
v4l2-compliance uses fork, since
|
||||
https://git.linuxtv.org/v4l-utils.git/commit/utils/v4l2-compliance/?id=79d98edd1a27233667a6bc38d3d7f8958c2ec02c
|
||||
|
||||
So don't build it if fork is not available
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/447d792ce21c0e33a36ca9384fee46e099435ed8
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
configure.ac | 5 ++++-
|
||||
utils/Makefile.am | 6 +++++-
|
||||
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5cc34c24..52ea5c6d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -478,7 +478,8 @@ AM_CONDITIONAL([WITH_QTGL], [test x${qt_pkgconfig_gl} = xtrue])
|
||||
AM_CONDITIONAL([WITH_GCONV], [test x$enable_gconv = xyes -a x$enable_shared == xyes -a x$with_gconvdir != x -a -f $with_gconvdir/gconv-modules])
|
||||
AM_CONDITIONAL([WITH_V4L2_CTL_LIBV4L], [test x${enable_v4l2_ctl_libv4l} != xno])
|
||||
AM_CONDITIONAL([WITH_V4L2_CTL_STREAM_TO], [test x${enable_v4l2_ctl_stream_to} != xno])
|
||||
-AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_LIBV4L], [test x${enable_v4l2_compliance_libv4l} != xno])
|
||||
+AM_CONDITIONAL([WITH_V4L2_COMPLIANCE], [test x$ac_cv_func_fork = xyes])
|
||||
+AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_LIBV4L], [test x$ac_cv_func_fork = xyes -a x${enable_v4l2_compliance_libv4l} != xno])
|
||||
AM_CONDITIONAL([WITH_BPF], [test x$enable_bpf != xno -a x$libelf_pkgconfig = xyes -a x$CLANG = xclang])
|
||||
|
||||
# append -static to libtool compile and link command to enforce static libs
|
||||
@@ -509,6 +510,7 @@ AM_COND_IF([WITH_V4L_PLUGINS], [USE_V4L_PLUGINS="yes"
|
||||
AM_COND_IF([WITH_V4L_WRAPPERS], [USE_V4L_WRAPPERS="yes"], [USE_V4L_WRAPPERS="no"])
|
||||
AM_COND_IF([WITH_GCONV], [USE_GCONV="yes"], [USE_GCONV="no"])
|
||||
AM_COND_IF([WITH_V4L2_CTL_LIBV4L], [USE_V4L2_CTL_LIBV4L="yes"], [USE_V4L2_CTL_LIBV4L="no"])
|
||||
+AM_COND_IF([WITH_V4L2_COMPLIANCE], [USE_V4L2_COMPLIANCE="yes"], [USE_V4L2_COMPLIANCE="no"])
|
||||
AM_COND_IF([WITH_V4L2_COMPLIANCE_LIBV4L], [USE_V4L2_COMPLIANCE_LIBV4L="yes"], [USE_V4L2_COMPLIANCE_LIBV4L="no"])
|
||||
AM_COND_IF([WITH_BPF], [USE_BPF="yes"
|
||||
AC_DEFINE([HAVE_BPF], [1], [BPF IR decoder support enabled])],
|
||||
@@ -556,6 +558,7 @@ compile time options summary
|
||||
qv4l2 : $USE_QV4L2
|
||||
qvidcap : $USE_QVIDCAP
|
||||
v4l2-ctl uses libv4l : $USE_V4L2_CTL_LIBV4L
|
||||
+ v4l2-compliance : $USE_V4L2_COMPLIANCE
|
||||
v4l2-compliance uses libv4l: $USE_V4L2_COMPLIANCE_LIBV4L
|
||||
BPF IR Decoders: : $USE_BPF
|
||||
EOF
|
||||
diff --git a/utils/Makefile.am b/utils/Makefile.am
|
||||
index 2d507028..9c29926a 100644
|
||||
--- a/utils/Makefile.am
|
||||
+++ b/utils/Makefile.am
|
||||
@@ -6,7 +6,6 @@ SUBDIRS = \
|
||||
cx18-ctl \
|
||||
keytable \
|
||||
media-ctl \
|
||||
- v4l2-compliance \
|
||||
v4l2-ctl \
|
||||
v4l2-dbg \
|
||||
v4l2-sysfs-path \
|
||||
@@ -20,6 +19,11 @@ SUBDIRS += \
|
||||
dvb
|
||||
endif
|
||||
|
||||
+if WITH_V4L2_COMPLIANCE
|
||||
+SUBDIRS += \
|
||||
+ v4l2-compliance
|
||||
+endif
|
||||
+
|
||||
if WITH_QV4L2
|
||||
SUBDIRS += qv4l2
|
||||
endif
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Locally calculated after checking signature
|
||||
# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.1.tar.bz2.asc
|
||||
sha256 7974e5626447407d8a1ed531da0461c0fe00e599a696cb548a240d17d3519005 v4l-utils-1.14.1.tar.bz2
|
||||
# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.3.tar.bz2.asc
|
||||
sha256 7c5c0d49c130cf65d384f28e9f3a53c5f7d17bf18740c48c40810e0fbbed5b54 v4l-utils-1.16.3.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING
|
||||
sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBV4L_VERSION = 1.14.1
|
||||
LIBV4L_VERSION = 1.16.3
|
||||
LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
|
||||
LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils
|
||||
LIBV4L_INSTALL_STAGING = YES
|
||||
LIBV4L_DEPENDENCIES = host-pkgconf
|
||||
LIBV4L_CONF_OPTS = --disable-doxygen-doc
|
||||
LIBV4L_CONF_OPTS = --disable-doxygen-doc --disable-qvidcap
|
||||
# We're patching contrib/test/Makefile.am
|
||||
LIBV4L_AUTORECONF = YES
|
||||
# add host-gettext for AM_ICONV macro
|
||||
@@ -45,6 +45,7 @@ LIBV4L_DEPENDENCIES += libgl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
LIBV4L_CONF_OPTS += --with-udevdir=/usr/lib/udev
|
||||
LIBV4L_DEPENDENCIES += udev
|
||||
endif
|
||||
|
||||
@@ -55,6 +56,11 @@ endif
|
||||
ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
|
||||
LIBV4L_CONF_OPTS += --enable-v4l-utils
|
||||
LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
# IR BPF decoder support needs toolchain with linux-headers >= 3.18
|
||||
# libelf and clang support
|
||||
LIBV4L_CONF_OPTS += --disable-bpf
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy)
|
||||
LIBV4L_CONF_OPTS += --enable-qv4l2
|
||||
LIBV4L_DEPENDENCIES += qt5base
|
||||
@@ -67,9 +73,6 @@ LIBV4L_CONF_ENV += \
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
|
||||
endif
|
||||
else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y)
|
||||
LIBV4L_CONF_OPTS += --enable-qv4l2
|
||||
LIBV4L_DEPENDENCIES += qt
|
||||
else
|
||||
LIBV4L_CONF_OPTS += --disable-qv4l2
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user