summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch108
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch53
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch10
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.16.0.bb (renamed from meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb)6
4 files changed, 8 insertions, 169 deletions
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch
deleted file mode 100644
index 12609d30e2..0000000000
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch
+++ /dev/null
@@ -1,108 +0,0 @@
1From 75372b8088c20474497b79ec6cf1e99f2d17f56d Mon Sep 17 00:00:00 2001
2From: Ismo Puustinen <ismo.puustinen@intel.com>
3Date: Mon, 3 Apr 2017 13:23:38 +0300
4Subject: [PATCH] buildsystem: do not assume building in source tree.
5
6Use $(top_srcdir) as reference for include paths and buildtime scripts.
7Otherwise compilation outside of project root directory will fail
8because header and script paths are wrong.
9
10To reproduce: mkdir b; cd b; ../configure; make
11
12Upstream-status: Accepted [https://git.linuxtv.org//v4l-utils.git/commit/?id=bd98c9a99bffc8d44c54859345e4dfee0ada4275]
13
14Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
15
16---
17 utils/cec-compliance/Makefile.am | 2 +-
18 utils/cec-ctl/Makefile.am | 2 +-
19 utils/cec-follower/Makefile.am | 4 ++--
20 utils/qv4l2/Makefile.am | 2 +-
21 utils/v4l2-compliance/Makefile.am | 2 +-
22 utils/v4l2-ctl/Makefile.am | 2 +-
23 6 files changed, 7 insertions(+), 7 deletions(-)
24
25diff --git a/utils/cec-compliance/Makefile.am b/utils/cec-compliance/Makefile.am
26index f05fe6c..f7d1535 100644
27--- a/utils/cec-compliance/Makefile.am
28+++ b/utils/cec-compliance/Makefile.am
29@@ -7,7 +7,7 @@ cec_compliance_LDFLAGS = -lrt
30 cec-compliance.cpp: cec-table.h
31
32 cec-table.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h
33- ../cec-ctl/msg2ctl.pl 2 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@
34+ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 2 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@
35
36 cec-compliance.cpp: version.h
37
38diff --git a/utils/cec-ctl/Makefile.am b/utils/cec-ctl/Makefile.am
39index 4a6eae5..570a070 100644
40--- a/utils/cec-ctl/Makefile.am
41+++ b/utils/cec-ctl/Makefile.am
42@@ -6,7 +6,7 @@ cec_ctl_SOURCES = cec-ctl.cpp
43 cec-ctl.cpp: cec-ctl-gen.h
44
45 cec-ctl-gen.h: msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h
46- ./msg2ctl.pl 0 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@
47+ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 0 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@
48
49 clean-local:
50 -rm -vf cec-ctl-gen.h
51diff --git a/utils/cec-follower/Makefile.am b/utils/cec-follower/Makefile.am
52index d8ad292..e3553eb 100644
53--- a/utils/cec-follower/Makefile.am
54+++ b/utils/cec-follower/Makefile.am
55@@ -7,12 +7,12 @@ cec_follower_LDFLAGS = -lrt
56 cec-log.cpp: cec-log.h
57
58 cec-log.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h
59- ../cec-ctl/msg2ctl.pl 1 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@
60+ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 1 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@
61
62 cec-follower.cpp: cec-table.h version.h
63
64 cec-table.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h
65- ../cec-ctl/msg2ctl.pl 2 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@
66+ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 2 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@
67
68 version.h:
69 @if git show-ref -s HEAD >/dev/null 2>&1; then \
70diff --git a/utils/qv4l2/Makefile.am b/utils/qv4l2/Makefile.am
71index fd58486..ccd1a2a 100644
72--- a/utils/qv4l2/Makefile.am
73+++ b/utils/qv4l2/Makefile.am
74@@ -8,7 +8,7 @@ qv4l2_SOURCES = qv4l2.cpp general-tab.cpp ctrl-tab.cpp vbi-tab.cpp capture-win.c
75 nodist_qv4l2_SOURCES = moc_qv4l2.cpp moc_general-tab.cpp moc_capture-win.cpp moc_vbi-tab.cpp qrc_qv4l2.cpp
76 qv4l2_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la \
77 ../libv4l2util/libv4l2util.la ../libmedia_dev/libmedia_dev.la
78-qv4l2_CPPFLAGS = -I../common
79+qv4l2_CPPFLAGS = -I$(top_srcdir)/utils/common
80
81 if WITH_QTGL
82 qv4l2_CPPFLAGS += $(QTGL_CFLAGS)
83diff --git a/utils/v4l2-compliance/Makefile.am b/utils/v4l2-compliance/Makefile.am
84index c2b5919..fb8d12e 100644
85--- a/utils/v4l2-compliance/Makefile.am
86+++ b/utils/v4l2-compliance/Makefile.am
87@@ -5,7 +5,7 @@ DEFS :=
88 v4l2_compliance_SOURCES = v4l2-compliance.cpp v4l2-test-debug.cpp v4l2-test-input-output.cpp \
89 v4l2-test-controls.cpp v4l2-test-io-config.cpp v4l2-test-formats.cpp v4l2-test-buffers.cpp \
90 v4l2-test-codecs.cpp v4l2-test-colors.cpp v4l2-compliance.h
91-v4l2_compliance_CPPFLAGS = -I../common
92+v4l2_compliance_CPPFLAGS = -I$(top_srcdir)/utils/common
93
94 if WITH_V4L2_COMPLIANCE_LIBV4L
95 v4l2_compliance_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread
96diff --git a/utils/v4l2-ctl/Makefile.am b/utils/v4l2-ctl/Makefile.am
97index 955647d..825e53f 100644
98--- a/utils/v4l2-ctl/Makefile.am
99+++ b/utils/v4l2-ctl/Makefile.am
100@@ -7,7 +7,7 @@ v4l2_ctl_SOURCES = v4l2-ctl.cpp v4l2-ctl.h v4l2-ctl-common.cpp v4l2-ctl-tuner.cp
101 v4l2-ctl-overlay.cpp v4l2-ctl-vbi.cpp v4l2-ctl-selection.cpp v4l2-ctl-misc.cpp \
102 v4l2-ctl-streaming.cpp v4l2-ctl-sdr.cpp v4l2-ctl-edid.cpp v4l2-ctl-modes.cpp \
103 v4l2-tpg-colors.c v4l2-tpg-core.c v4l-stream.c
104-v4l2_ctl_CPPFLAGS = -I../common
105+v4l2_ctl_CPPFLAGS = -I$(top_srcdir)/utils/common
106
107 if WITH_V4L2_CTL_LIBV4L
108 v4l2_ctl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch
deleted file mode 100644
index 82fc3e120f..0000000000
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From b2efcc20617d6317f74c4acb2a6af5b765f20b34 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 14 Jul 2017 13:11:25 -0700
4Subject: [PATCH] ir-ctl: Define TEMP_FAILURE_RETRY if undefined
5
6use strndup() instead of strndupa() which is not
7universally available in C libraries
8
9Taken from AlpineLinux
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13---
14 utils/ir-ctl/ir-ctl.c | 14 +++++++++++++-
15 1 file changed, 13 insertions(+), 1 deletion(-)
16
17diff --git a/utils/ir-ctl/ir-ctl.c b/utils/ir-ctl/ir-ctl.c
18index bc58cee..1a44011 100644
19--- a/utils/ir-ctl/ir-ctl.c
20+++ b/utils/ir-ctl/ir-ctl.c
21@@ -42,6 +42,16 @@
22 # define _(string) string
23 #endif
24
25+/* taken from glibc unistd.h */
26+#ifndef TEMP_FAILURE_RETRY
27+#define TEMP_FAILURE_RETRY(expression) \
28+ (__extension__ \
29+ ({ long int __result; \
30+ do __result = (long int) (expression); \
31+ while (__result == -1L && errno == EINTR); \
32+ __result; }))
33+#endif
34+
35 # define N_(string) string
36
37
38@@ -344,12 +354,14 @@ static struct file *read_scancode(const char *name)
39 return NULL;
40 }
41
42- pstr = strndupa(name, p - name);
43+ pstr = strndup(name, p - name);
44
45 if (!protocol_match(pstr, &proto)) {
46 fprintf(stderr, _("error: protocol '%s' not found\n"), pstr);
47+ free(pstr);
48 return NULL;
49 }
50+ free(pstr);
51
52 if (!strtoscancode(p + 1, &scancode)) {
53 fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1);
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 a779a307d7..8033fcacf2 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
@@ -6,17 +6,16 @@ Subject: [PATCH] contrib/test: Link mc_nextgen_test with libargp if needed
6musl depends on external argp implementation e.g. 6musl depends on external argp implementation e.g.
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10--- 9---
11 contrib/test/Makefile.am | 2 +- 10 contrib/test/Makefile.am | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
13 12
14diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am 13diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am
15index 4641e21..e47b948 100644 14index 0188fe2..dac07f3 100644
16--- a/contrib/test/Makefile.am 15--- a/contrib/test/Makefile.am
17+++ b/contrib/test/Makefile.am 16+++ b/contrib/test/Makefile.am
18@@ -32,7 +32,7 @@ v4l2gl_LDFLAGS = $(X11_LIBS) $(GL_LIBS) $(GLU_LIBS) $(ARGP_LIBS) 17@@ -40,7 +40,7 @@ sdlcam_CFLAGS = -I../.. $(SDL2_CFLAGS)
19 v4l2gl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la 18 sdlcam_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la
20 19
21 mc_nextgen_test_CFLAGS = $(LIBUDEV_CFLAGS) 20 mc_nextgen_test_CFLAGS = $(LIBUDEV_CFLAGS)
22-mc_nextgen_test_LDFLAGS = $(LIBUDEV_LIBS) 21-mc_nextgen_test_LDFLAGS = $(LIBUDEV_LIBS)
@@ -24,3 +23,6 @@ index 4641e21..e47b948 100644
24 23
25 24
26 ioctl_test_SOURCES = ioctl-test.c ioctl-test.h ioctl_32.h ioctl_64.h 25 ioctl_test_SOURCES = ioctl-test.c ioctl-test.h ioctl_32.h ioctl_64.h
26--
272.17.1
28
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.16.0.bb
index 3bcbed850b..bcead00b06 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.16.0.bb
@@ -17,15 +17,13 @@ PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,,"
17 17
18SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ 18SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \
19 file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ 19 file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \
20 file://0001-buildsystem-do-not-assume-building-in-source-tree.patch \
21 file://mediactl-pkgconfig.patch \ 20 file://mediactl-pkgconfig.patch \
22 file://export-mediactl-headers.patch \ 21 file://export-mediactl-headers.patch \
23 file://0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch \
24 file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \ 22 file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \
25 file://0003-v4l2-ctl-Do-not-use-getsubopt.patch \ 23 file://0003-v4l2-ctl-Do-not-use-getsubopt.patch \
26 " 24 "
27SRC_URI[md5sum] = "89e1ed6c69c94e0489dc0a638c7841aa" 25SRC_URI[md5sum] = "21a6ec3605a1c3114c8ccb70a963c871"
28SRC_URI[sha256sum] = "5a47dd6f0e7dfe902d94605c01d385a4a4e87583ff5856d6f181900ea81cf46e" 26SRC_URI[sha256sum] = "f1b425584284bac378b76331c0671dc890bd7af49c03e8a6cc0c70e57eea0bad"
29 27
30EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev" 28EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev"
31 29
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-26 06:08:44 +0000