Skip to contentSkip to conversation

v4l-utils: fix compilation with external intl

PATCH In review Rosen Penev 1 participant 2 messages Jul 23, 2024 – Aug 2, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 v4l-utils: fix compilation with external intl

Currently there's an assumption that intl is provided by libc. This is not always the case, especially when deciding to use external Gettext.

---
 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(+)
lib/libdvbv5/meson.build +1 -0
index 0b92e404..8f5929fc 100644
@@ -124,6 +124,7 @@ install_headers(libdvbv5_api, subdir: 'libdvbv5')
 
 libdvbv5_deps = [
     dep_iconv,
+    dep_intl,
     dep_libm,
     dep_librt,
     dep_libudev,
meson.build +2 -0
index 423876e1..d6c692f1 100644
@@ -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
utils/dvb/meson.build +1 -0
index 871f5a39..762028bd 100644
@@ -1,5 +1,6 @@
 dvb_common_deps =  [
     dep_argp,
+    dep_intl,
     dep_libdvbv5,
     dep_libudev,
     dep_threads,
utils/ir-ctl/meson.build +1 -0
index 24d73a15..fd26a624 100644
@@ -12,6 +12,7 @@ ir_ctl_sources = files(
 
 ir_ctl_deps =  [
     dep_argp,
+    dep_intl,
 ]
 
 ir_ctl = executable('ir-ctl',
utils/keytable/meson.build +1 -0
index 76ce329e..c02d4ea9 100644
@@ -11,6 +11,7 @@ ir_keytable_sources = files(
 
 ir_keytable_deps = [
     dep_argp,
+    dep_intl,
 ]
 
 ir_keytable_system_dir = udevdir
Signature · 1 line
2.45.2
#1 lore raw
Quoted 5 lines · Rosen Penev

Currently there's an assumption that intl is provided by libc. This is not always the case, especially when deciding to use external Gettext.

ping

Quoted 71 lines
---
 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(+)
lib/libdvbv5/meson.build +1 -0
index 0b92e404..8f5929fc 100644
@@ -124,6 +124,7 @@ install_headers(libdvbv5_api, subdir: 'libdvbv5')
 
 libdvbv5_deps = [
     dep_iconv,
+    dep_intl,
     dep_libm,
     dep_librt,
     dep_libudev,
meson.build +2 -0
index 423876e1..d6c692f1 100644
@@ -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
utils/dvb/meson.build +1 -0
index 871f5a39..762028bd 100644
@@ -1,5 +1,6 @@
 dvb_common_deps =  [
     dep_argp,
+    dep_intl,
     dep_libdvbv5,
     dep_libudev,
     dep_threads,
utils/ir-ctl/meson.build +1 -0
index 24d73a15..fd26a624 100644
@@ -12,6 +12,7 @@ ir_ctl_sources = files(
 
 ir_ctl_deps =  [
     dep_argp,
+    dep_intl,
 ]
 
 ir_ctl = executable('ir-ctl',
utils/keytable/meson.build +1 -1
index 76ce329e..c02d4ea9 100644
@@ -11,6 +11,7 @@ ir_keytable_sources = files(
 
 ir_keytable_deps = [
     dep_argp,
+    dep_intl,
 ]
 
 ir_keytable_system_dir = udevdir
--

2.45.2