diff options
author | Daniel Gomez <daniel@qtec.com> | 2022-03-14 09:56:42 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-03-14 09:16:05 -0700 |
commit | 85e19026501188e6176506a89e0b2659f4697c45 (patch) | |
tree | 7f9dcdf4520345985422dac7512510a27097071c /meta-oe/recipes-multimedia/v4l2apps/v4l-utils | |
parent | 268e844999c417010baecdf5b42c7b32e2f4b658 (diff) | |
download | meta-openembedded-85e19026501188e6176506a89e0b2659f4697c45.tar.gz |
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>
Diffstat (limited to 'meta-oe/recipes-multimedia/v4l2apps/v4l-utils')
-rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch | 7 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch (renamed from meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch) | 5 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch (renamed from meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch) | 5 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch | 9 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch | 47 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch | 40 |
7 files changed, 15 insertions, 126 deletions
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch index eb294b3fb..8ac8fbe19 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 67a6e919b8263d6d2b7150e62f26fb06bbc526ef Mon Sep 17 00:00:00 2001 | 1 | From 0d5c0e9a75eca43667b0e29155b635e50622b66a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 27 Feb 2015 21:55:36 +0000 | 3 | Date: Fri, 27 Feb 2015 21:55:36 +0000 |
4 | Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and | 4 | Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and |
5 | |||
5 | libv4l2subdev" | 6 | libv4l2subdev" |
6 | 7 | ||
7 | This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729. | 8 | This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729. |
@@ -16,7 +17,7 @@ Conflicts: | |||
16 | 1 file changed, 3 insertions(+), 7 deletions(-) | 17 | 1 file changed, 3 insertions(+), 7 deletions(-) |
17 | 18 | ||
18 | diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am | 19 | diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am |
19 | index ee7dcc9..d11fa2e 100644 | 20 | index c48c8d6..e255e16 100644 |
20 | --- a/utils/media-ctl/Makefile.am | 21 | --- a/utils/media-ctl/Makefile.am |
21 | +++ b/utils/media-ctl/Makefile.am | 22 | +++ b/utils/media-ctl/Makefile.am |
22 | @@ -1,8 +1,7 @@ | 23 | @@ -1,8 +1,7 @@ |
@@ -30,7 +31,7 @@ index ee7dcc9..d11fa2e 100644 | |||
30 | +libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) | 31 | +libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) |
31 | 32 | ||
32 | media-bus-format-names.h: ../../include/linux/media-bus-format.h | 33 | media-bus-format-names.h: ../../include/linux/media-bus-format.h |
33 | sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ | 34 | $(AM_V_GEN) sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ |
34 | @@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES) | 35 | @@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES) |
35 | nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) | 36 | nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) |
36 | libv4l2subdev_la_SOURCES = libv4l2subdev.c | 37 | libv4l2subdev_la_SOURCES = libv4l2subdev.c |
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 deleted file mode 100644 index a849d465c..000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 49f865a17d62db7bbd333a9b83fadeea55686e35 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 14 Jul 2017 13:17:19 -0700 | ||
4 | Subject: [PATCH] contrib/test: Link mc_nextgen_test with libargp if needed | ||
5 | |||
6 | musl depends on external argp implementation e.g. | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | contrib/test/Makefile.am | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am | ||
14 | index 0188fe2..dac07f3 100644 | ||
15 | --- a/contrib/test/Makefile.am | ||
16 | +++ b/contrib/test/Makefile.am | ||
17 | @@ -42,7 +42,7 @@ sdlcam_CFLAGS = -I../.. $(SDL2_CFLAGS) | ||
18 | sdlcam_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la | ||
19 | |||
20 | mc_nextgen_test_CFLAGS = $(LIBUDEV_CFLAGS) | ||
21 | -mc_nextgen_test_LDFLAGS = $(LIBUDEV_LIBS) | ||
22 | +mc_nextgen_test_LDFLAGS = $(ARGP_LIBS) $(LIBUDEV_LIBS) | ||
23 | |||
24 | |||
25 | ioctl_test_SOURCES = ioctl-test.c ioctl-test.h ioctl_32.h ioctl_64.h | ||
26 | -- | ||
27 | 2.17.1 | ||
28 | |||
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch index 9fcf61165..52fc2d7a8 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch | |||
@@ -1,13 +1,14 @@ | |||
1 | From 480c04ac6a9d11bfef9d4aca073052fdcee4fdea Mon Sep 17 00:00:00 2001 | 1 | From 320b8378ee30eb5e0fe83a8b397f822f2f88a4c1 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 1 Mar 2015 22:25:07 +0000 | 3 | Date: Sun, 1 Mar 2015 22:25:07 +0000 |
4 | Subject: [PATCH] %% original patch: mediactl-pkgconfig.patch | ||
4 | 5 | ||
5 | --- | 6 | --- |
6 | utils/media-ctl/Makefile.am | 1 + | 7 | utils/media-ctl/Makefile.am | 1 + |
7 | 1 file changed, 1 insertion(+) | 8 | 1 file changed, 1 insertion(+) |
8 | 9 | ||
9 | diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am | 10 | diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am |
10 | index d11fa2e..7c520a2 100644 | 11 | index e255e16..ff7b417 100644 |
11 | --- a/utils/media-ctl/Makefile.am | 12 | --- a/utils/media-ctl/Makefile.am |
12 | +++ b/utils/media-ctl/Makefile.am | 13 | +++ b/utils/media-ctl/Makefile.am |
13 | @@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la | 14 | @@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la |
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch index 55a5cdc8a..39dc33835 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch | |||
@@ -1,13 +1,14 @@ | |||
1 | From b82e509c10659a4647961a6da3adf4d285dea2dd Mon Sep 17 00:00:00 2001 | 1 | From f7109d6b2fcb291824d795071c04a492d9fbc45b Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 1 Mar 2015 22:25:07 +0000 | 3 | Date: Sun, 1 Mar 2015 22:25:07 +0000 |
4 | Subject: [PATCH] %% original patch: export-mediactl-headers.patch | ||
4 | 5 | ||
5 | --- | 6 | --- |
6 | utils/media-ctl/Makefile.am | 4 ++-- | 7 | utils/media-ctl/Makefile.am | 4 ++-- |
7 | 1 file changed, 2 insertions(+), 2 deletions(-) | 8 | 1 file changed, 2 insertions(+), 2 deletions(-) |
8 | 9 | ||
9 | diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am | 10 | diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am |
10 | index 7c520a2..748353d 100644 | 11 | index ff7b417..6ce656f 100644 |
11 | --- a/utils/media-ctl/Makefile.am | 12 | --- a/utils/media-ctl/Makefile.am |
12 | +++ b/utils/media-ctl/Makefile.am | 13 | +++ b/utils/media-ctl/Makefile.am |
13 | @@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES) | 14 | @@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES) |
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 e3ce45d16..d8d1b8d18 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4a10eab0e31d69948161241b1801c41201a5d081 Mon Sep 17 00:00:00 2001 | 1 | From e4582c11f76b9390a3e172dcf0741dca90a9dc8d Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 30 Nov 2019 18:50:34 -0800 | 3 | Date: Sat, 30 Nov 2019 18:50:34 -0800 |
4 | Subject: [PATCH] Do not use getsubopt | 4 | Subject: [PATCH] Do not use getsubopt |
@@ -12,20 +12,21 @@ Imported from Alpine Linux | |||
12 | 12 | ||
13 | Upstream-Status: Pending | 13 | Upstream-Status: Pending |
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
15 | |||
15 | --- | 16 | --- |
16 | utils/v4l2-ctl/v4l2-ctl-common.cpp | 18 ++++++++++-------- | 17 | utils/v4l2-ctl/v4l2-ctl-common.cpp | 18 ++++++++++-------- |
17 | 1 file changed, 10 insertions(+), 8 deletions(-) | 18 | 1 file changed, 10 insertions(+), 8 deletions(-) |
18 | 19 | ||
19 | diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp | 20 | diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp |
20 | index 651917e..cea57b7 100644 | 21 | index c940171..49c0f39 100644 |
21 | --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp | 22 | --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp |
22 | +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp | 23 | +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp |
23 | @@ -785,15 +785,17 @@ static bool parse_subset(char *optarg) | 24 | @@ -956,15 +956,17 @@ static bool parse_subset(char *optarg) |
24 | 25 | ||
25 | static bool parse_next_subopt(char **subs, char **value) | 26 | static bool parse_next_subopt(char **subs, char **value) |
26 | { | 27 | { |
27 | - static char *const subopts[] = { | 28 | - static char *const subopts[] = { |
28 | - NULL | 29 | - nullptr |
29 | - }; | 30 | - }; |
30 | - int opt = getsubopt(subs, subopts, value); | 31 | - int opt = getsubopt(subs, subopts, value); |
31 | + char *p = *subs; | 32 | + char *p = *subs; |
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch deleted file mode 100644 index 5aec3c574..000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 3f61e353424fb9ea3dce742022b94dfd7ea1ed9f Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelmann@pengutronix.de> | ||
3 | Date: Thu, 4 Mar 2021 14:23:39 +0100 | ||
4 | Subject: [PATCH] configure.ac: autodetect availability of systemd | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Import systemd's official suggestion [1] how this should be handled in packages | ||
10 | using autoconf. A side effect of this is the removal of the hardcoded fallback | ||
11 | path "/lib/systemd/system" which leaks build host information when cross | ||
12 | compiling v4l-utils and therefore defeats reproducible builds. | ||
13 | |||
14 | [1] https://www.freedesktop.org/software/systemd/man/daemon.html#Installing%20systemd%20Service%20Files | ||
15 | |||
16 | Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=3f61e353424fb9ea3dce742022b94dfd7ea1ed9f] | ||
17 | |||
18 | Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> | ||
19 | Signed-off-by: Sean Young <sean@mess.org> | ||
20 | --- | ||
21 | configure.ac | 10 +++++++++- | ||
22 | 1 file changed, 9 insertions(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/configure.ac b/configure.ac | ||
25 | index 727730c5ccf4..8470116df4b1 100644 | ||
26 | --- a/configure.ac | ||
27 | +++ b/configure.ac | ||
28 | @@ -388,7 +388,15 @@ AC_ARG_WITH(udevdir, | ||
29 | AC_ARG_WITH(systemdsystemunitdir, | ||
30 | AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [set systemd system unit directory]), | ||
31 | [], | ||
32 | - [with_systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd || echo /lib/systemd/system`]) | ||
33 | + [with_systemdsystemunitdir=auto]) | ||
34 | +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], | ||
35 | + [def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) | ||
36 | + AS_IF([test "x$def_systemdsystemunitdir" = "x"], | ||
37 | + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], | ||
38 | + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) | ||
39 | + with_systemdsystemunitdir=no], | ||
40 | + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) | ||
41 | +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) | ||
42 | |||
43 | # Generic check: works with most distributions | ||
44 | 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` | ||
45 | -- | ||
46 | 2.29.2 | ||
47 | |||
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch deleted file mode 100644 index 63a695f8f..000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 01f2c6c58e6f4441df7df8e27eb7919f1f01e310 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelmann@pengutronix.de> | ||
3 | Date: Thu, 4 Mar 2021 14:23:40 +0100 | ||
4 | Subject: [PATCH] keytable: restrict installation of 50-rc_keymap.conf | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | It is only needed if BPF is effectively used and the package is compiled for a | ||
10 | systemd based target. | ||
11 | |||
12 | Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=01f2c6c58e6f4441df7df8e27eb7919f1f01e310] | ||
13 | |||
14 | Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> | ||
15 | Signed-off-by: Sean Young <sean@mess.org> | ||
16 | --- | ||
17 | utils/keytable/Makefile.am | 4 ++++ | ||
18 | 1 file changed, 4 insertions(+) | ||
19 | |||
20 | diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am | ||
21 | index c5eb414acf2f..eee61f0e0551 100644 | ||
22 | --- a/utils/keytable/Makefile.am | ||
23 | +++ b/utils/keytable/Makefile.am | ||
24 | @@ -3,9 +3,13 @@ man_MANS = ir-keytable.1 rc_keymap.5 | ||
25 | sysconf_DATA = rc_maps.cfg | ||
26 | keytablesystem_DATA = $(srcdir)/rc_keymaps/* | ||
27 | udevrules_DATA = 70-infrared.rules | ||
28 | +if WITH_BPF | ||
29 | +if HAVE_SYSTEMD | ||
30 | if HAVE_UDEVDSYSCALLFILTER | ||
31 | systemdsystemunit_DATA = 50-rc_keymap.conf | ||
32 | endif | ||
33 | +endif | ||
34 | +endif | ||
35 | |||
36 | ir_keytable_SOURCES = keytable.c parse.h ir-encode.c ir-encode.h toml.c toml.h keymap.c keymap.h | ||
37 | |||
38 | -- | ||
39 | 2.29.2 | ||
40 | |||