libv4l: bump version to 1.16.1

deleted file mode 100644
index cd22be15c4..0000000000
@@ -1,39 +0,0 @@
-From abfe3e7b2b4af1de9b891f3a7a996b70533b0a27 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <[email protected]>
-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 at vger.kernel.org/msg127134.html]
-Signed-off-by: Peter Seiderer <[email protected]>
----
- 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
-

45 lines not on this page · raw message

deleted file mode 100644
index c66f4d8033..0000000000
@@ -1,30 +0,0 @@
-From f7eb207a3b90fef6a9c8fbdc506e809cc9757bd1 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-Date: Thu, 20 Sep 2018 21:20:16 +0200
-Subject: [PATCH] v4l2-ctl: fix glibc 2.28 build
-
-Include header needed for the major/minor macros in glibc 2.28+.
-
-This patch is extracted from upstream commit 65e7b2a4076845d (v4l2-ctl: show
-media/entity info if available).
-
-Signed-off-by: Baruch Siach <[email protected]>
----
- utils/v4l2-ctl/v4l2-ctl.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp
-index e02dc756..12a19bc7 100644
---- a/utils/v4l2-ctl/v4l2-ctl.cpp
-+++ b/utils/v4l2-ctl/v4l2-ctl.cpp
-@@ -33,6 +33,7 @@
- #include <errno.h>
- #include <sys/ioctl.h>
- #include <sys/time.h>
-+#include <sys/sysmacros.h>
- #include <dirent.h>
- #include <math.h>
- 
--- 
-2.14.4
-

index 5e0df1f7a9..5dd5e45003 100644
@@ -1,6 +1,6 @@
 # Locally calculated after checking signature
-# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.2.tar.bz2.asc
-sha256 e6b962c4b1253cf852c31da13fd6b5bb7cbe5aa9e182881aec55123bae680692  v4l-utils-1.14.2.tar.bz2
+# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.1.tar.bz2.asc
+sha256 c7e4d6f4b4b7f278a6fa4bf56385526920d40fbd9e3e2827b75ddcd41da0504a  v4l-utils-1.16.1.tar.bz2
 # Locally calculated
 sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a  COPYING
 sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78  COPYING.libv4l

index 55f02b7e8e..388378c877 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBV4L_VERSION = 1.14.2
+LIBV4L_VERSION = 1.16.1
 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils
 LIBV4L_INSTALL_STAGING = YES

@@ -56,7 +56,7 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
 LIBV4L_CONF_OPTS += --enable-v4l-utils
 LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
 ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy)
-LIBV4L_CONF_OPTS += --enable-qv4l2
+LIBV4L_CONF_OPTS += --enable-qv4l2 --disable-qvidcap
 LIBV4L_DEPENDENCIES += qt5base
 # protect against host version detection of moc-qt5/rcc-qt5/uic-qt5
 LIBV4L_CONF_ENV += \

@@ -68,10 +68,10 @@ 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_CONF_OPTS += --enable-qv4l2 --disable-qvidcap
 LIBV4L_DEPENDENCIES += qt
 else
-LIBV4L_CONF_OPTS += --disable-qv4l2
+LIBV4L_CONF_OPTS += --disable-qv4l2 --disable-qvidcap
 endif
 else
 LIBV4L_CONF_OPTS += --disable-v4l-utils