diff mbox series

v4l-utils: fix compilation with external intl

Message ID 20240723020521.16953-1-rosenp@gmail.com (mailing list archive)
State Accepted
Delegated to: Hans Verkuil
Headers
Series v4l-utils: fix compilation with external intl |

Commit Message

Rosen Penev July 23, 2024, 2:05 a.m. UTC 
  Currently there's an assumption that intl is provided by libc. This is
not always the case, especially when deciding to use external Gettext.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 lib/libdvbv5/meson.build   | 1 +
 meson.build                | 2 ++
 utils/dvb/meson.build      | 1 +
 utils/ir-ctl/meson.build   | 1 +
 utils/keytable/meson.build | 1 +
 5 files changed, 6 insertions(+)

Comments

Rosen Penev Aug. 2, 2024, 12:15 a.m. UTC | #1 
On Mon, Jul 22, 2024 at 7:05 PM Rosen Penev <rosenp@gmail.com> wrote:
>
> Currently there's an assumption that intl is provided by libc. This is
> not always the case, especially when deciding to use external Gettext.
>
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
ping
> ---
>  lib/libdvbv5/meson.build   | 1 +
>  meson.build                | 2 ++
>  utils/dvb/meson.build      | 1 +
>  utils/ir-ctl/meson.build   | 1 +
>  utils/keytable/meson.build | 1 +
>  5 files changed, 6 insertions(+)
>
> diff --git a/lib/libdvbv5/meson.build b/lib/libdvbv5/meson.build
> index 0b92e404..8f5929fc 100644
> --- a/lib/libdvbv5/meson.build
> +++ b/lib/libdvbv5/meson.build
> @@ -124,6 +124,7 @@ install_headers(libdvbv5_api, subdir: 'libdvbv5')
>
>  libdvbv5_deps = [
>      dep_iconv,
> +    dep_intl,
>      dep_libm,
>      dep_librt,
>      dep_libudev,
> diff --git a/meson.build b/meson.build
> index 423876e1..d6c692f1 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -202,6 +202,8 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
>      endif
>  endif
>
> +dep_intl = dependency('intl')
> +
>  have_gconv = cc.has_header('gconv.h', required : get_option('gconv'))
>
>  # Detect system gconv directory
> diff --git a/utils/dvb/meson.build b/utils/dvb/meson.build
> index 871f5a39..762028bd 100644
> --- a/utils/dvb/meson.build
> +++ b/utils/dvb/meson.build
> @@ -1,5 +1,6 @@
>  dvb_common_deps =  [
>      dep_argp,
> +    dep_intl,
>      dep_libdvbv5,
>      dep_libudev,
>      dep_threads,
> diff --git a/utils/ir-ctl/meson.build b/utils/ir-ctl/meson.build
> index 24d73a15..fd26a624 100644
> --- a/utils/ir-ctl/meson.build
> +++ b/utils/ir-ctl/meson.build
> @@ -12,6 +12,7 @@ ir_ctl_sources = files(
>
>  ir_ctl_deps =  [
>      dep_argp,
> +    dep_intl,
>  ]
>
>  ir_ctl = executable('ir-ctl',
> diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build
> index 76ce329e..c02d4ea9 100644
> --- a/utils/keytable/meson.build
> +++ b/utils/keytable/meson.build
> @@ -11,6 +11,7 @@ ir_keytable_sources = files(
>
>  ir_keytable_deps = [
>      dep_argp,
> +    dep_intl,
>  ]
>
>  ir_keytable_system_dir = udevdir
> --
> 2.45.2
>
diff mbox series

Patch

diff --git a/lib/libdvbv5/meson.build b/lib/libdvbv5/meson.build
index 0b92e404..8f5929fc 100644
--- a/lib/libdvbv5/meson.build
+++ b/lib/libdvbv5/meson.build
@@ -124,6 +124,7 @@  install_headers(libdvbv5_api, subdir: 'libdvbv5')
 
 libdvbv5_deps = [
     dep_iconv,
+    dep_intl,
     dep_libm,
     dep_librt,
     dep_libudev,
diff --git a/meson.build b/meson.build
index 423876e1..d6c692f1 100644
--- a/meson.build
+++ b/meson.build
@@ -202,6 +202,8 @@  size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
     endif
 endif
 
+dep_intl = dependency('intl')
+
 have_gconv = cc.has_header('gconv.h', required : get_option('gconv'))
 
 # Detect system gconv directory
diff --git a/utils/dvb/meson.build b/utils/dvb/meson.build
index 871f5a39..762028bd 100644
--- a/utils/dvb/meson.build
+++ b/utils/dvb/meson.build
@@ -1,5 +1,6 @@ 
 dvb_common_deps =  [
     dep_argp,
+    dep_intl,
     dep_libdvbv5,
     dep_libudev,
     dep_threads,
diff --git a/utils/ir-ctl/meson.build b/utils/ir-ctl/meson.build
index 24d73a15..fd26a624 100644
--- a/utils/ir-ctl/meson.build
+++ b/utils/ir-ctl/meson.build
@@ -12,6 +12,7 @@  ir_ctl_sources = files(
 
 ir_ctl_deps =  [
     dep_argp,
+    dep_intl,
 ]
 
 ir_ctl = executable('ir-ctl',
diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build
index 76ce329e..c02d4ea9 100644
--- a/utils/keytable/meson.build
+++ b/utils/keytable/meson.build
@@ -11,6 +11,7 @@  ir_keytable_sources = files(
 
 ir_keytable_deps = [
     dep_argp,
+    dep_intl,
 ]
 
 ir_keytable_system_dir = udevdir