v4l-utils: update to 1.20.0

Add new buildtime configuration options, update context of two patches and
remove two patches as there are fixes [1]-[3] found upstream in the meantime.

[1] 38f4ce74275a ("keytable: use input_event properly")
[2] 8b7e6ce9367f ("keytable: add compatibility for input_event_sec")
[3] 976a2f681b4e ("keymap.h needs sys/types.h and argp.h with musl")

Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

5 files changed, 7 insertions, 93 deletions

diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch
index 8033fcacf2..a849d465c7 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch
@@ -14,7 +14,7 @@ diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am
 index 0188fe2..dac07f3 100644
 --- a/contrib/test/Makefile.am
 +++ b/contrib/test/Makefile.am
-@@ -40,7 +40,7 @@ sdlcam_CFLAGS = -I../.. $(SDL2_CFLAGS)
+@@ -42,7 +42,7 @@ sdlcam_CFLAGS = -I../.. $(SDL2_CFLAGS)
  sdlcam_LDADD = ../../lib/libv4l2/libv4l2.la  ../../lib/libv4lconvert/libv4lconvert.la
  
  mc_nextgen_test_CFLAGS = $(LIBUDEV_CFLAGS)
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch
deleted file mode 100644
index 57948add6e..0000000000
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 137ce23ae677b11e5483ef810751edae7bf96bb9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 30 Nov 2019 18:40:06 -0800
-Subject: [PATCH] Define error_t and include sys/types.h
-
-Fix 'unknown type name' for error_t and u_int32_t.
-u_int32_t is defined in sys/type.h
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- utils/ir-ctl/keymap.h   | 4 ++++
- utils/keytable/keymap.h | 5 +++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/utils/ir-ctl/keymap.h b/utils/ir-ctl/keymap.h
-index f2b2963..1f8a3f8 100644
---- a/utils/ir-ctl/keymap.h
-+++ b/utils/ir-ctl/keymap.h
-@@ -2,6 +2,10 @@
- #ifndef __KEYMAP_H
- #define __KEYMAP_H
- 
-+#include <sys/types.h>
-+#ifndef error_t
-+typedef int error_t;
-+#endif
- struct keymap {
-        struct keymap *next;
-        char *name;
-diff --git a/utils/keytable/keymap.h b/utils/keytable/keymap.h
-index f2b2963..345d55d 100644
---- a/utils/keytable/keymap.h
-+++ b/utils/keytable/keymap.h
-@@ -2,6 +2,11 @@
- #ifndef __KEYMAP_H
- #define __KEYMAP_H
- 
-+#include <sys/types.h>
-+#ifndef error_t
-+typedef int error_t;
-+#endif
-+
- struct keymap {
-        struct keymap *next;
-        char *name;
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch
deleted file mode 100644
index a8926762ed..0000000000
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b213da2d5fcc93cd24fc880c71c717d8e2ce2968 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 30 Nov 2019 18:43:21 -0800
-Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
-
-time element is deprecated on new input_event structure in kernel's
-input.h [1]
-
-[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- utils/keytable/keytable.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c
-index 6cb0217..59ff1ee 100644
---- a/utils/keytable/keytable.c
-+++ b/utils/keytable/keytable.c
-@@ -53,6 +53,11 @@
- 
- # define N_(string) string
- 
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- struct input_keymap_entry_v2 {
- #define KEYMAP_BY_INDEX        (1 << 0)
-        u_int8_t  flags;
-@@ -1533,7 +1538,7 @@ static void test_event(struct rc_device *rc_dev, int fd)
- 
-                for (i = 0; i < rd / sizeof(struct input_event); i++) {
-                        printf(_("%ld.%06ld: event type %s(0x%02x)"),
--                               ev[i].time.tv_sec, ev[i].time.tv_usec,
-+                               ev[i].input_event_sec, ev[i].input_event_usec,
-                                get_event_name(events_type, ev[i].type), ev[i].type);
- 
-                        switch (ev[i].type) {
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch
index ac704c72dc..e3ce45d167 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch
@@ -20,7 +20,7 @@ diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common
 index 651917e..cea57b7 100644
 --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp
 +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp
-@@ -782,15 +782,17 @@ static bool parse_subset(char *optarg)
+@@ -785,15 +785,17 @@ static bool parse_subset(char *optarg)
  
  static bool parse_next_subopt(char **subs, char **value)
  {
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb
index 193335deaa..7d96646220 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.1.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb
@@ -20,14 +20,14 @@ SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \
            file://mediactl-pkgconfig.patch \
            file://export-mediactl-headers.patch \
            file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \
-           file://0005-Define-error_t-and-include-sys-types.h.patch \
-           file://0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
            file://0007-Do-not-use-getsubopt.patch \
            "
-SRC_URI[md5sum] = "ff2dd75970683be9a301ed949b3372b3"
-SRC_URI[sha256sum] = "25fc42253722401f8742f04dc50a444dfa9b75378e7d09b55035bcbb44c5f342"
+SRC_URI[md5sum] = "46f9e2c0b2fdccd009da2f7e1aa87894"
+SRC_URI[sha256sum] = "956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7"
 
-EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev"
+EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev \
+                --disable-v4l2-compliance-32 --disable-v4l2-ctl-32 \
+                --with-systemdsystemunitdir=${systemd_system_unitdir}"
 
 VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps"