mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 14:25:53 +01:00
v4l-utils: Update 1.20.0 -> 1.22.1
- Drop patches already upstream. - Update getsubopt [1] patch to the new 1.22.1 sources. [1]: 0007-Do-not-use-getsubopt.patch Signed-off-by: Daniel Gomez <daniel@qtec.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Daniel Gomez
Khem Raj
parent
268e844999
commit
85e1902650
|
|
@ -1,7 +1,8 @@
|
|||
From 67a6e919b8263d6d2b7150e62f26fb06bbc526ef Mon Sep 17 00:00:00 2001
|
||||
From 0d5c0e9a75eca43667b0e29155b635e50622b66a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 27 Feb 2015 21:55:36 +0000
|
||||
Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and
|
||||
|
||||
libv4l2subdev"
|
||||
|
||||
This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729.
|
||||
|
|
@ -16,7 +17,7 @@ Conflicts:
|
|||
1 file changed, 3 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am
|
||||
index ee7dcc9..d11fa2e 100644
|
||||
index c48c8d6..e255e16 100644
|
||||
--- a/utils/media-ctl/Makefile.am
|
||||
+++ b/utils/media-ctl/Makefile.am
|
||||
@@ -1,8 +1,7 @@
|
||||
|
|
@ -30,7 +31,7 @@ index ee7dcc9..d11fa2e 100644
|
|||
+libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS)
|
||||
|
||||
media-bus-format-names.h: ../../include/linux/media-bus-format.h
|
||||
sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \
|
||||
$(AM_V_GEN) sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \
|
||||
@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES)
|
||||
nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES)
|
||||
libv4l2subdev_la_SOURCES = libv4l2subdev.c
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
From 49f865a17d62db7bbd333a9b83fadeea55686e35 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 14 Jul 2017 13:17:19 -0700
|
||||
Subject: [PATCH] contrib/test: Link mc_nextgen_test with libargp if needed
|
||||
|
||||
musl depends on external argp implementation e.g.
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
contrib/test/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
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
|
||||
@@ -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)
|
||||
-mc_nextgen_test_LDFLAGS = $(LIBUDEV_LIBS)
|
||||
+mc_nextgen_test_LDFLAGS = $(ARGP_LIBS) $(LIBUDEV_LIBS)
|
||||
|
||||
|
||||
ioctl_test_SOURCES = ioctl-test.c ioctl-test.h ioctl_32.h ioctl_64.h
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -1,13 +1,14 @@
|
|||
From 480c04ac6a9d11bfef9d4aca073052fdcee4fdea Mon Sep 17 00:00:00 2001
|
||||
From 320b8378ee30eb5e0fe83a8b397f822f2f88a4c1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 1 Mar 2015 22:25:07 +0000
|
||||
Subject: [PATCH] %% original patch: mediactl-pkgconfig.patch
|
||||
|
||||
---
|
||||
utils/media-ctl/Makefile.am | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am
|
||||
index d11fa2e..7c520a2 100644
|
||||
index e255e16..ff7b417 100644
|
||||
--- a/utils/media-ctl/Makefile.am
|
||||
+++ b/utils/media-ctl/Makefile.am
|
||||
@@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la
|
||||
|
|
@ -1,13 +1,14 @@
|
|||
From b82e509c10659a4647961a6da3adf4d285dea2dd Mon Sep 17 00:00:00 2001
|
||||
From f7109d6b2fcb291824d795071c04a492d9fbc45b Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 1 Mar 2015 22:25:07 +0000
|
||||
Subject: [PATCH] %% original patch: export-mediactl-headers.patch
|
||||
|
||||
---
|
||||
utils/media-ctl/Makefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am
|
||||
index 7c520a2..748353d 100644
|
||||
index ff7b417..6ce656f 100644
|
||||
--- a/utils/media-ctl/Makefile.am
|
||||
+++ b/utils/media-ctl/Makefile.am
|
||||
@@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES)
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 4a10eab0e31d69948161241b1801c41201a5d081 Mon Sep 17 00:00:00 2001
|
||||
From e4582c11f76b9390a3e172dcf0741dca90a9dc8d Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 30 Nov 2019 18:50:34 -0800
|
||||
Subject: [PATCH] Do not use getsubopt
|
||||
|
|
@ -12,20 +12,21 @@ Imported from Alpine Linux
|
|||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
---
|
||||
utils/v4l2-ctl/v4l2-ctl-common.cpp | 18 ++++++++++--------
|
||||
1 file changed, 10 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp
|
||||
index 651917e..cea57b7 100644
|
||||
index c940171..49c0f39 100644
|
||||
--- a/utils/v4l2-ctl/v4l2-ctl-common.cpp
|
||||
+++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp
|
||||
@@ -785,15 +785,17 @@ static bool parse_subset(char *optarg)
|
||||
@@ -956,15 +956,17 @@ static bool parse_subset(char *optarg)
|
||||
|
||||
static bool parse_next_subopt(char **subs, char **value)
|
||||
{
|
||||
- static char *const subopts[] = {
|
||||
- NULL
|
||||
- nullptr
|
||||
- };
|
||||
- int opt = getsubopt(subs, subopts, value);
|
||||
+ char *p = *subs;
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
From 3f61e353424fb9ea3dce742022b94dfd7ea1ed9f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelmann@pengutronix.de>
|
||||
Date: Thu, 4 Mar 2021 14:23:39 +0100
|
||||
Subject: [PATCH] configure.ac: autodetect availability of systemd
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Import systemd's official suggestion [1] how this should be handled in packages
|
||||
using autoconf. A side effect of this is the removal of the hardcoded fallback
|
||||
path "/lib/systemd/system" which leaks build host information when cross
|
||||
compiling v4l-utils and therefore defeats reproducible builds.
|
||||
|
||||
[1] https://www.freedesktop.org/software/systemd/man/daemon.html#Installing%20systemd%20Service%20Files
|
||||
|
||||
Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=3f61e353424fb9ea3dce742022b94dfd7ea1ed9f]
|
||||
|
||||
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
---
|
||||
configure.ac | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 727730c5ccf4..8470116df4b1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -388,7 +388,15 @@ AC_ARG_WITH(udevdir,
|
||||
AC_ARG_WITH(systemdsystemunitdir,
|
||||
AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [set systemd system unit directory]),
|
||||
[],
|
||||
- [with_systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd || echo /lib/systemd/system`])
|
||||
+ [with_systemdsystemunitdir=auto])
|
||||
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"],
|
||||
+ [def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
|
||||
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
|
||||
+ [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
|
||||
+ [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
|
||||
+ with_systemdsystemunitdir=no],
|
||||
+ [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
|
||||
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
|
||||
|
||||
# Generic check: works with most distributions
|
||||
def_gconv_dir=`for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do if @<:@ -d \$i/gconv @:>@; then echo \$i/gconv; break; fi; done`
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From 01f2c6c58e6f4441df7df8e27eb7919f1f01e310 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelmann@pengutronix.de>
|
||||
Date: Thu, 4 Mar 2021 14:23:40 +0100
|
||||
Subject: [PATCH] keytable: restrict installation of 50-rc_keymap.conf
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It is only needed if BPF is effectively used and the package is compiled for a
|
||||
systemd based target.
|
||||
|
||||
Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=01f2c6c58e6f4441df7df8e27eb7919f1f01e310]
|
||||
|
||||
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
---
|
||||
utils/keytable/Makefile.am | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am
|
||||
index c5eb414acf2f..eee61f0e0551 100644
|
||||
--- a/utils/keytable/Makefile.am
|
||||
+++ b/utils/keytable/Makefile.am
|
||||
@@ -3,9 +3,13 @@ man_MANS = ir-keytable.1 rc_keymap.5
|
||||
sysconf_DATA = rc_maps.cfg
|
||||
keytablesystem_DATA = $(srcdir)/rc_keymaps/*
|
||||
udevrules_DATA = 70-infrared.rules
|
||||
+if WITH_BPF
|
||||
+if HAVE_SYSTEMD
|
||||
if HAVE_UDEVDSYSCALLFILTER
|
||||
systemdsystemunit_DATA = 50-rc_keymap.conf
|
||||
endif
|
||||
+endif
|
||||
+endif
|
||||
|
||||
ir_keytable_SOURCES = keytable.c parse.h ir-encode.c ir-encode.h toml.c toml.h keymap.c keymap.h
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -18,15 +18,13 @@ PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,,"
|
|||
|
||||
SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \
|
||||
file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \
|
||||
file://mediactl-pkgconfig.patch \
|
||||
file://export-mediactl-headers.patch \
|
||||
file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \
|
||||
file://0002-original-patch-mediactl-pkgconfig.patch \
|
||||
file://0003-original-patch-export-mediactl-headers.patch \
|
||||
file://0007-Do-not-use-getsubopt.patch \
|
||||
file://0008-configure.ac-autodetect-availability-of-systemd.patch \
|
||||
file://0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "46f9e2c0b2fdccd009da2f7e1aa87894"
|
||||
SRC_URI[sha256sum] = "956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7"
|
||||
|
||||
SRC_URI[md5sum] = "8aa73287320a49e9170a8255d7b2c7e6"
|
||||
SRC_URI[sha256sum] = "65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31"
|
||||
|
||||
EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev \
|
||||
--disable-v4l2-compliance-32 --disable-v4l2-ctl-32"
|
||||
Loading…
Reference in New Issue
Block a user