diff options
Diffstat (limited to 'meta-oe/recipes-multimedia/v4l2apps')
3 files changed, 3 insertions, 79 deletions
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch deleted file mode 100644 index 032bf00c7..000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 1d9ce7cd799770981043f656373cbd1bf7558b9a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 26 Jan 2023 17:00:00 -0800 | ||
4 | Subject: [PATCH] media-info: Include missing <cstdint> for uintptr_t | ||
5 | |||
6 | gcc 13 moved some includes around and as a result <cstdint> is no longer | ||
7 | transitively included [1]. Explicitly include it. | ||
8 | |||
9 | [1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes | ||
10 | |||
11 | Upstream-Status: Submitted [https://lore.kernel.org/linux-media/20230127010741.3883339-1-raj.khem@gmail.com/] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | utils/common/media-info.cpp | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/utils/common/media-info.cpp b/utils/common/media-info.cpp | ||
18 | index 53e132f5..1a25a4b6 100644 | ||
19 | --- a/utils/common/media-info.cpp | ||
20 | +++ b/utils/common/media-info.cpp | ||
21 | @@ -3,6 +3,7 @@ | ||
22 | * Copyright 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved. | ||
23 | */ | ||
24 | |||
25 | +#include <cstdint> | ||
26 | #include <cstring> | ||
27 | #include <fstream> | ||
28 | #include <iostream> | ||
29 | -- | ||
30 | 2.39.1 | ||
31 | |||
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch deleted file mode 100644 index 0548e4fba..000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 4fe9f6071cd24bcab157a9398adcca474f619f8d Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Kjellerstedt <pkj@axis.com> | ||
3 | Date: Sat, 15 Oct 2022 02:45:26 +0200 | ||
4 | Subject: [PATCH] configure.ac, Makefile.am: Support building without NLS | ||
5 | |||
6 | Avoid entering the v4l-utils-po and libdvbv5-po directories if NLS | ||
7 | support is disabled, as the generated Makefiles in those directories are | ||
8 | empty then. | ||
9 | |||
10 | Upstream-Status: Submitted [https://patchwork.linuxtv.org/project/linux-media/patch/20221015010541.688322-1-pkj@axis.com/] | ||
11 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
12 | --- | ||
13 | Makefile.am | 6 +++++- | ||
14 | configure.ac | 1 + | ||
15 | 2 files changed, 6 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/Makefile.am b/Makefile.am | ||
18 | index 7fb443ab..8e924af8 100644 | ||
19 | --- a/Makefile.am | ||
20 | +++ b/Makefile.am | ||
21 | @@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS = foreign | ||
22 | ACLOCAL_AMFLAGS = -I m4 | ||
23 | AM_MAKEFLAGS = $(word 1, $(subst 1, -w, $(filter 1, $(V))) --no-print-directory) | ||
24 | |||
25 | -SUBDIRS = v4l-utils-po libdvbv5-po lib | ||
26 | +SUBDIRS = lib | ||
27 | + | ||
28 | +if USE_NLS | ||
29 | +SUBDIRS += v4l-utils-po libdvbv5-po | ||
30 | +endif | ||
31 | |||
32 | if WITH_V4LUTILS | ||
33 | SUBDIRS += utils contrib | ||
34 | diff --git a/configure.ac b/configure.ac | ||
35 | index 05298981..7c78467f 100644 | ||
36 | --- a/configure.ac | ||
37 | +++ b/configure.ac | ||
38 | @@ -99,6 +99,7 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen_libdvbv5.cfg) | ||
39 | ALL_LINGUAS="" | ||
40 | m4_ifdef(AM_GNU_GETTEXT_REQUIRE_VERSION,[AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])],[AM_GNU_GETTEXT_VERSION([0.19.8])]) | ||
41 | AM_GNU_GETTEXT([external]) | ||
42 | +AM_CONDITIONAL([USE_NLS], [test "$USE_NLS" = "yes"]) | ||
43 | |||
44 | LIBDVBV5_DOMAIN="libdvbv5" | ||
45 | AC_DEFINE([LIBDVBV5_DOMAIN], "libdvbv5", [libdvbv5 domain]) | ||
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb index b42300f09..c23b6e3e7 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb | |||
@@ -31,11 +31,11 @@ SRC_URI = "\ | |||
31 | file://0002-original-patch-mediactl-pkgconfig.patch \ | 31 | file://0002-original-patch-mediactl-pkgconfig.patch \ |
32 | file://0003-original-patch-export-mediactl-headers.patch \ | 32 | file://0003-original-patch-export-mediactl-headers.patch \ |
33 | file://0004-Do-not-use-getsubopt.patch \ | 33 | file://0004-Do-not-use-getsubopt.patch \ |
34 | file://0005-configure.ac-Makefile.am-Support-building-without-NL.patch \ | ||
35 | file://0001-media-info-Include-missing-cstdint-for-uintptr_t.patch \ | ||
36 | " | 34 | " |
37 | 35 | ||
38 | SRCREV = "fd544473800d02e90bc289434cc44e5aa8fadd0f" | 36 | SRCREV = "9431e4b26b4842d1401e80ada9f14593dca3a94c" |
37 | |||
38 | PV .= "+git${SRCPV}" | ||
39 | 39 | ||
40 | S = "${WORKDIR}/git" | 40 | S = "${WORKDIR}/git" |
41 | B = "${S}" | 41 | B = "${S}" |