09816566f4
After some effort to upstream the libv4l patches, 4 out of our 5 patches are now upstream. This commit updates those patches to indicate their upstream status. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
111 lines
3.4 KiB
Diff
111 lines
3.4 KiB
Diff
From 12e5dded4747bf3a3f1eb392a17d10e46ecbc90b Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Wed, 28 Oct 2015 09:29:08 +0100
|
|
Subject: [PATCH] utils: Properly use ENABLE_NLS for locale related code
|
|
|
|
Various tools in utils/ use ENABLE_NLS to decide whether locale
|
|
support is available or not, and only include <locale.h> if ENABLE_NLS
|
|
is defined. However, they unconditionally use functions defined in
|
|
<locale.h> such as setlocale(), bindtextdomain() or textdomain(),
|
|
which causes build failures when the prototypes of such functions are
|
|
not available due to <locale.h> not being included.
|
|
|
|
In order to fix this, we add ENABLE_NLS conditionals around the calls
|
|
to these functions.
|
|
|
|
Patch upstream at:
|
|
http://git.linuxtv.org/v4l-utils.git/commit/?id=defad307a09c11ba989e6338bb0293c0e1acba87.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
---
|
|
utils/dvb/dvb-fe-tool.c | 2 ++
|
|
utils/dvb/dvb-format-convert.c | 2 ++
|
|
utils/dvb/dvbv5-scan.c | 2 ++
|
|
utils/dvb/dvbv5-zap.c | 2 ++
|
|
utils/keytable/keytable.c | 2 ++
|
|
5 files changed, 10 insertions(+)
|
|
|
|
diff --git a/utils/dvb/dvb-fe-tool.c b/utils/dvb/dvb-fe-tool.c
|
|
index efc2ebf..ba01aa9 100644
|
|
--- a/utils/dvb/dvb-fe-tool.c
|
|
+++ b/utils/dvb/dvb-fe-tool.c
|
|
@@ -276,9 +276,11 @@ int main(int argc, char *argv[])
|
|
struct dvb_v5_fe_parms *parms;
|
|
int fe_flags = O_RDWR;
|
|
|
|
+#ifdef ENABLE_NLS
|
|
setlocale (LC_ALL, "");
|
|
bindtextdomain (PACKAGE, LOCALEDIR);
|
|
textdomain (PACKAGE);
|
|
+#endif
|
|
|
|
argp_parse(&argp, argc, argv, ARGP_NO_HELP | ARGP_NO_EXIT, 0, 0);
|
|
|
|
diff --git a/utils/dvb/dvb-format-convert.c b/utils/dvb/dvb-format-convert.c
|
|
index e39df03..09451d4 100644
|
|
--- a/utils/dvb/dvb-format-convert.c
|
|
+++ b/utils/dvb/dvb-format-convert.c
|
|
@@ -132,9 +132,11 @@ int main(int argc, char **argv)
|
|
.args_doc = N_("<input file> <output file>"),
|
|
};
|
|
|
|
+#ifdef ENABLE_NLS
|
|
setlocale (LC_ALL, "");
|
|
bindtextdomain (PACKAGE, LOCALEDIR);
|
|
textdomain (PACKAGE);
|
|
+#endif
|
|
|
|
memset(&args, 0, sizeof(args));
|
|
argp_parse(&argp, argc, argv, ARGP_NO_HELP | ARGP_NO_EXIT, &idx, &args);
|
|
diff --git a/utils/dvb/dvbv5-scan.c b/utils/dvb/dvbv5-scan.c
|
|
index be1586d..1bb0ced 100644
|
|
--- a/utils/dvb/dvbv5-scan.c
|
|
+++ b/utils/dvb/dvbv5-scan.c
|
|
@@ -461,9 +461,11 @@ int main(int argc, char **argv)
|
|
.args_doc = N_("<initial file>"),
|
|
};
|
|
|
|
+#ifdef ENABLE_NLS
|
|
setlocale (LC_ALL, "");
|
|
bindtextdomain (PACKAGE, LOCALEDIR);
|
|
textdomain (PACKAGE);
|
|
+#endif
|
|
|
|
memset(&args, 0, sizeof(args));
|
|
args.sat_number = -1;
|
|
diff --git a/utils/dvb/dvbv5-zap.c b/utils/dvb/dvbv5-zap.c
|
|
index 2812166..848259b 100644
|
|
--- a/utils/dvb/dvbv5-zap.c
|
|
+++ b/utils/dvb/dvbv5-zap.c
|
|
@@ -758,9 +758,11 @@ int main(int argc, char **argv)
|
|
.args_doc = N_("<channel name> [or <frequency> if in monitor mode]"),
|
|
};
|
|
|
|
+#ifdef ENABLE_NLS
|
|
setlocale (LC_ALL, "");
|
|
bindtextdomain (PACKAGE, LOCALEDIR);
|
|
textdomain (PACKAGE);
|
|
+#endif
|
|
|
|
memset(&args, 0, sizeof(args));
|
|
args.sat_number = -1;
|
|
diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c
|
|
index 3bf0618..d6d187f 100644
|
|
--- a/utils/keytable/keytable.c
|
|
+++ b/utils/keytable/keytable.c
|
|
@@ -1467,9 +1467,11 @@ int main(int argc, char *argv[])
|
|
static struct sysfs_names *names;
|
|
struct rc_device rc_dev;
|
|
|
|
+#ifdef ENABLE_NLS
|
|
setlocale (LC_ALL, "");
|
|
bindtextdomain (PACKAGE, LOCALEDIR);
|
|
textdomain (PACKAGE);
|
|
+#endif
|
|
|
|
argp_parse(&argp, argc, argv, ARGP_NO_HELP | ARGP_NO_EXIT, 0, 0);
|
|
|
|
--
|
|
2.6.2
|
|
|