summaryrefslogtreecommitdiffstats
path: root/package/libv4l
diff options
context:
space:
mode:
Diffstat (limited to 'package/libv4l')
-rw-r--r--package/libv4l/0004-v4l2-compliance-needs-fork.patch76
-rw-r--r--package/libv4l/0005-Add-missing-linux-bpf_common.h.patch80
-rw-r--r--package/libv4l/libv4l.hash4
-rw-r--r--package/libv4l/libv4l.mk7
4 files changed, 82 insertions, 85 deletions
diff --git a/package/libv4l/0004-v4l2-compliance-needs-fork.patch b/package/libv4l/0004-v4l2-compliance-needs-fork.patch
new file mode 100644
index 0000000000..d29a059520
--- /dev/null
+++ b/package/libv4l/0004-v4l2-compliance-needs-fork.patch
@@ -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
+
diff --git a/package/libv4l/0005-Add-missing-linux-bpf_common.h.patch b/package/libv4l/0005-Add-missing-linux-bpf_common.h.patch
deleted file mode 100644
index d43ea70027..0000000000
--- a/package/libv4l/0005-Add-missing-linux-bpf_common.h.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 311e344039d58cfde09dd34f14804db8ac0513c9 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Fri, 2 Nov 2018 18:58:53 +0100
-Subject: [PATCH] Add missing linux/bpf_common.h
-
-Copy from [1], needed by bpf.h.
-
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/include/uapi/linux/bpf_common.h?h=v4.19
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- include/linux/bpf_common.h | 57 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 57 insertions(+)
- create mode 100644 include/linux/bpf_common.h
-
-diff --git a/include/linux/bpf_common.h b/include/linux/bpf_common.h
-new file mode 100644
-index 00000000..ee97668b
---- /dev/null
-+++ b/include/linux/bpf_common.h
-@@ -0,0 +1,57 @@
-+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-+#ifndef _UAPI__LINUX_BPF_COMMON_H__
-+#define _UAPI__LINUX_BPF_COMMON_H__
-+
-+/* Instruction classes */
-+#define BPF_CLASS(code) ((code) & 0x07)
-+#define BPF_LD 0x00
-+#define BPF_LDX 0x01
-+#define BPF_ST 0x02
-+#define BPF_STX 0x03
-+#define BPF_ALU 0x04
-+#define BPF_JMP 0x05
-+#define BPF_RET 0x06
-+#define BPF_MISC 0x07
-+
-+/* ld/ldx fields */
-+#define BPF_SIZE(code) ((code) & 0x18)
-+#define BPF_W 0x00 /* 32-bit */
-+#define BPF_H 0x08 /* 16-bit */
-+#define BPF_B 0x10 /* 8-bit */
-+/* eBPF BPF_DW 0x18 64-bit */
-+#define BPF_MODE(code) ((code) & 0xe0)
-+#define BPF_IMM 0x00
-+#define BPF_ABS 0x20
-+#define BPF_IND 0x40
-+#define BPF_MEM 0x60
-+#define BPF_LEN 0x80
-+#define BPF_MSH 0xa0
-+
-+/* alu/jmp fields */
-+#define BPF_OP(code) ((code) & 0xf0)
-+#define BPF_ADD 0x00
-+#define BPF_SUB 0x10
-+#define BPF_MUL 0x20
-+#define BPF_DIV 0x30
-+#define BPF_OR 0x40
-+#define BPF_AND 0x50
-+#define BPF_LSH 0x60
-+#define BPF_RSH 0x70
-+#define BPF_NEG 0x80
-+#define BPF_MOD 0x90
-+#define BPF_XOR 0xa0
-+
-+#define BPF_JA 0x00
-+#define BPF_JEQ 0x10
-+#define BPF_JGT 0x20
-+#define BPF_JGE 0x30
-+#define BPF_JSET 0x40
-+#define BPF_SRC(code) ((code) & 0x08)
-+#define BPF_K 0x00
-+#define BPF_X 0x08
-+
-+#ifndef BPF_MAXINSNS
-+#define BPF_MAXINSNS 4096
-+#endif
-+
-+#endif /* _UAPI__LINUX_BPF_COMMON_H__ */
---
-2.19.1
-
diff --git a/package/libv4l/libv4l.hash b/package/libv4l/libv4l.hash
index 5dd5e45003..2b01c1a713 100644
--- a/package/libv4l/libv4l.hash
+++ b/package/libv4l/libv4l.hash
@@ -1,6 +1,6 @@
# Locally calculated after checking signature
-# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.1.tar.bz2.asc
-sha256 c7e4d6f4b4b7f278a6fa4bf56385526920d40fbd9e3e2827b75ddcd41da0504a v4l-utils-1.16.1.tar.bz2
+# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.2.tar.bz2.asc
+sha256 6c3208c9a1c73455d30bae83096d161e57bec5008594f270a2a67df8c86d8e47 v4l-utils-1.16.2.tar.bz2
# Locally calculated
sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING
sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index f473c03806..6b5b7bd2ee 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBV4L_VERSION = 1.16.1
+LIBV4L_VERSION = 1.16.2
LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils
LIBV4L_INSTALL_STAGING = YES
@@ -56,8 +56,9 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
LIBV4L_CONF_OPTS += --enable-v4l-utils
LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
-# Disable clang that is used to build BPF (in-kernel bytecode machine) protocols
-LIBV4L_CONF_ENV += ac_cv_prog_CLANG=""
+# 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
OpenPOWER on IntegriCloud