[Buildroot] [PATCH v1] package/libv4l: bump version to 1.22.1

[Peter Seiderer <ps.report@gmx.net>]

- remove 001-keymap.h-add-missing-includes-to-fix-musl-build.patch
  (superseeded by upstream commit [1])

- add handling of new --with-libudev/--without-libudev option

For details see [2].

[1] https://git.linuxtv.org/v4l-utils.git/commit/?id=976a2f681b4e4e16edffd972d53a623b895c5646
[2] https://git.linuxtv.org/v4l-utils.git/tree/ChangeLog?h=stable-1.22

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 ...d-missing-includes-to-fix-musl-build.patch | 68 -------------------
 package/libv4l/libv4l.hash                    |  2 +-
 package/libv4l/libv4l.mk                      |  6 +-
 3 files changed, 5 insertions(+), 71 deletions(-)
 delete mode 100644 package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch

diff --git a/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch b/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch
deleted file mode 100644
index 238f8fc377..0000000000
--- a/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From baba68cdcb44fc11d0ba8ce2c13eb5b06bbd9b33 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Wed, 30 Oct 2019 07:15:23 +0100
-Subject: [PATCH] keymap.h: add missing includes to fix musl build
-
-Needed to fix these build errors:
-
-In file included from keymap.c:13:0:
-keymap.h:23:2: error: unknown type name 'u_int32_t'
-  u_int32_t scancode;
-
-keymap.h:36:1: error: unknown type name 'error_t'
- error_t parse_keymap(char *fname, struct keymap **keymap, bool verbose);
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
-Patch was not sent upstream due to broken mailing list setup:
-
-<majordomo@vger.kernel.org>: host vger.kernel.org[209.132.180.67] said: 553
-    5.7.1 Hello [xx.xx.xx.xx], for your MAIL FROM address
-    <bernd.kuhls@t-online.de> policy analysis reported: Your address is not
-    liked source for email (in reply to MAIL FROM command)
-
-Hello [xx.xx.xx.xx], for your MAIL FROM address <berndkuhls@hotmail.com>
- policy analysis reported: Your address is not liked source for email 
-
- utils/common/keymap.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/utils/common/keymap.h b/utils/common/keymap.h
-index f2b29632..bb1edce9 100644
---- a/utils/common/keymap.h
-+++ b/utils/common/keymap.h
-@@ -1,4 +1,8 @@
- /* SPDX-License-Identifier: GPL-2.0 */
-+
-+#include <argp.h>
-+#include <sys/types.h>
-+
- #ifndef __KEYMAP_H
- #define __KEYMAP_H
- 
-diff -uNr v4l-utils-1.18.0.orig/utils/ir-ctl/keymap.h v4l-utils-1.18.0/utils/ir-ctl/keymap.h
---- v4l-utils-1.18.0.orig/utils/ir-ctl/keymap.h	2019-09-22 11:22:54.000000000 +0200
-+++ v4l-utils-1.18.0/utils/ir-ctl/keymap.h	2019-10-30 07:06:18.250548011 +0100
-@@ -1,4 +1,8 @@
- /* SPDX-License-Identifier: GPL-2.0 */
-+
-+#include <argp.h>
-+#include <sys/types.h>
-+
- #ifndef __KEYMAP_H
- #define __KEYMAP_H
- 
-diff -uNr v4l-utils-1.18.0.orig/utils/keytable/keymap.h v4l-utils-1.18.0/utils/keytable/keymap.h
---- v4l-utils-1.18.0.orig/utils/keytable/keymap.h	2019-09-22 11:22:54.000000000 +0200
-+++ v4l-utils-1.18.0/utils/keytable/keymap.h	2019-10-30 07:06:56.218816126 +0100
-@@ -1,4 +1,8 @@
- /* SPDX-License-Identifier: GPL-2.0 */
-+
-+#include <argp.h>
-+#include <sys/types.h>
-+
- #ifndef __KEYMAP_H
- #define __KEYMAP_H
- 
--- 
-2.20.1
diff --git a/package/libv4l/libv4l.hash b/package/libv4l/libv4l.hash
index e45dd576bd..d99d5e0992 100644
--- a/package/libv4l/libv4l.hash
+++ b/package/libv4l/libv4l.hash
@@ -1,7 +1,7 @@
 # Locally calculated after checking signature
 # https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2.asc
 # with key 05D0169C26E41593418129DF199A64FADFB500FF
-sha256 956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7  v4l-utils-1.20.0.tar.bz2
+sha256  65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31  v4l-utils-1.22.1.tar.bz2
 
 # Locally calculated
 sha256  391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a  COPYING
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index 7b61823cec..b11c8975d1 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBV4L_VERSION = 1.20.0
+LIBV4L_VERSION = 1.22.1
 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils
 LIBV4L_INSTALL_STAGING = YES
@@ -45,8 +45,10 @@ LIBV4L_DEPENDENCIES += libgl
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-LIBV4L_CONF_OPTS += --with-udevdir=/usr/lib/udev
+LIBV4L_CONF_OPTS += --with-libudev --with-udevdir=/usr/lib/udev
 LIBV4L_DEPENDENCIES += udev
+else
+LIBV4L_CONF_OPTS += --without-libudev
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGLU),y)
-- 
2.33.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot