diff options
| author |   Peter Kjellerstedt <pkj@axis.com> | 2022-10-15 03:36:43 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-10-15 18:24:49 -0700 |
| commit | 442909de282d76a6fdbc08ee87b188405c1c3a28 (patch) | |
| tree | 5d40a9f63e9fdf5e695fb1252c3c07f2903594e3 /meta-oe/recipes-multimedia | |
| parent | 5b8ae45ee56c0659c1ee9aa9c6db41f5727d44b7 (diff) | |
| download | meta-openembedded-contrib-442909de282d76a6fdbc08ee87b188405c1c3a28.tar.gz | |
v4l-utils: Support building without NLS
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
| -rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch | 45 | ||||
| -rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb | 1 |
2 files changed, 46 insertions, 0 deletions
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 new file mode 100644 index 0000000000..0548e4fba1 --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch @@ -0,0 +1,45 @@ +From 4fe9f6071cd24bcab157a9398adcca474f619f8d Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt <pkj@axis.com> +Date: Sat, 15 Oct 2022 02:45:26 +0200 +Subject: [PATCH] configure.ac, Makefile.am: Support building without NLS + +Avoid entering the v4l-utils-po and libdvbv5-po directories if NLS +support is disabled, as the generated Makefiles in those directories are +empty then. + +Upstream-Status: Submitted [https://patchwork.linuxtv.org/project/linux-media/patch/20221015010541.688322-1-pkj@axis.com/] +Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> +--- + Makefile.am | 6 +++++- + configure.ac | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 7fb443ab..8e924af8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS = foreign + ACLOCAL_AMFLAGS = -I m4 + AM_MAKEFLAGS = $(word 1, $(subst 1, -w, $(filter 1, $(V))) --no-print-directory) + +-SUBDIRS = v4l-utils-po libdvbv5-po lib ++SUBDIRS = lib ++ ++if USE_NLS ++SUBDIRS += v4l-utils-po libdvbv5-po ++endif + + if WITH_V4LUTILS + SUBDIRS += utils contrib +diff --git a/configure.ac b/configure.ac +index 05298981..7c78467f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -99,6 +99,7 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen_libdvbv5.cfg) + ALL_LINGUAS="" + m4_ifdef(AM_GNU_GETTEXT_REQUIRE_VERSION,[AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])],[AM_GNU_GETTEXT_VERSION([0.19.8])]) + AM_GNU_GETTEXT([external]) ++AM_CONDITIONAL([USE_NLS], [test "$USE_NLS" = "yes"]) + + LIBDVBV5_DOMAIN="libdvbv5" + 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 2f5ae3586a..5bc63058f6 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 @@ -27,6 +27,7 @@ SRC_URI = "\ file://0002-original-patch-mediactl-pkgconfig.patch \ file://0003-original-patch-export-mediactl-headers.patch \ file://0004-Do-not-use-getsubopt.patch \ + file://0005-configure.ac-Makefile.am-Support-building-without-NL.patch \ " SRCREV = "fd544473800d02e90bc289434cc44e5aa8fadd0f" |