[git:v4l-utils/master] meson: Fix building with -Dv4l-utils=false
This is an automatic generated email to let you know that the following patch
were queued at the
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: meson: Fix building with -Dv4l-utils=false
Author: James Le Cuirot
Date:Tue Dec 12 15:24:05 2023 +
ir_bpf_enabled was referenced without being defined.
Tested-by: Peter Seiderer
Signed-off-by: Hans Verkuil
meson.build | 2 ++
1 file changed, 2 insertions(+)
---
http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=fee976dcfe3be03cc72c099f9ed3bac938a34b58
diff --git a/meson.build b/meson.build
index 3529f6d2f91a..0f35173bb36a 100644
--- a/meson.build
+++ b/meson.build
@@ -383,6 +383,8 @@ subdir('lib')
if get_option('v4l-utils')
subdir('utils')
subdir('contrib')
+else
+ir_bpf_enabled = false
endif
subdir('doc')
___
linuxtv-commits mailing list -- linuxtv-commits@linuxtv.org
To unsubscribe send an email to linuxtv-commits-le...@linuxtv.org
%(web_page_url)slistinfo/%(_internal_name)s
[git:v4l-utils/master] meson: Allow documentation directory to be specified with -Ddocdir
This is an automatic generated email to let you know that the following patch
were queued at the
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: meson: Allow documentation directory to be specified with -Ddocdir
Author: James Le Cuirot
Date:Tue Dec 12 15:24:06 2023 +
This is needed by Gentoo Linux QA.
Signed-off-by: James Le Cuirot
Signed-off-by: Hans Verkuil
doc/meson.build | 2 +-
meson.build | 5 +
meson_options.txt | 2 ++
3 files changed, 8 insertions(+), 1 deletion(-)
---
http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=87c9abb2cb3ee814f657abf7ffea7a25596f8198
diff --git a/doc/meson.build b/doc/meson.build
index 8f4437e74d72..4b23c3de8991 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -20,7 +20,7 @@ doxygen_install_dirs = []
doxygen_output = []
if get_option('doxygen-html')
doxygen_output += 'html'
-doxygen_install_dirs += get_option('datadir') / 'doc' /
'@0@'.format(meson.project_name())
+doxygen_install_dirs += docdir
endif
if get_option('doxygen-man')
doxygen_output += 'man'
diff --git a/meson.build b/meson.build
index 0f35173bb36a..900377fa0918 100644
--- a/meson.build
+++ b/meson.build
@@ -307,6 +307,11 @@ if udevdir == ''
udevdir = '/lib/udev'
endif
+docdir = get_option('docdir')
+if docdir == ''
+docdir = get_option('datadir') / 'doc' / '@0@'.format(meson.project_name())
+endif
+
qt_opengl_test = '''
#define GL_GLEXT_PROTOTYPES
#define QT_NO_OPENGL_ES_2
diff --git a/meson_options.txt b/meson_options.txt
index 2fa046c0dfea..53cf832f5e82 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -32,6 +32,8 @@ option('v4l2-ctl-stream-to', type : 'boolean',
description : 'Enable use of --stream-to in v4l2-ctl')
# Directories
+option('docdir', type : 'string',
+ description : 'Set documentation directory')
option('gconvsysdir', type : 'string',
description : 'Set system gconv directory (default is to autodetect)')
option('libv4l1subdir', type : 'string', value : 'libv4l',
___
linuxtv-commits mailing list -- linuxtv-commits@linuxtv.org
To unsubscribe send an email to linuxtv-commits-le...@linuxtv.org
%(web_page_url)slistinfo/%(_internal_name)s
[git:v4l-utils/master] cv4l-helpers.h: add missing helper functions
This is an automatic generated email to let you know that the following patch
were queued at the
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: cv4l-helpers.h: add missing helper functions
Author: Hans Verkuil
Date:Wed Jan 17 10:32:50 2024 +0100
This header was missing has_touch(), has_meta_cap() and has_meta_out().
Add these.
Signed-off-by: Hans Verkuil
utils/common/cv4l-helpers.h | 3 +++
1 file changed, 3 insertions(+)
---
http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=2d0a47ad3e7db6e3ecd053dbcee772299eeb82ed
diff --git a/utils/common/cv4l-helpers.h b/utils/common/cv4l-helpers.h
index 397973b9c16f..77c6517a45d1 100644
--- a/utils/common/cv4l-helpers.h
+++ b/utils/common/cv4l-helpers.h
@@ -78,6 +78,9 @@ public:
bool has_rds_out() const { return v4l_has_rds_out(this); }
bool has_sdr_cap() const { return v4l_has_sdr_cap(this); }
bool has_sdr_out() const { return v4l_has_sdr_out(this); }
+ bool has_touch() const { return v4l_has_touch(this); }
+ bool has_meta_cap() const { return v4l_has_meta_cap(this); }
+ bool has_meta_out() const { return v4l_has_meta_out(this); }
bool has_hwseek() const { return v4l_has_hwseek(this); }
bool has_rw() const { return v4l_has_rw(this); }
bool has_streaming() const { return v4l_has_streaming(this); }
___
linuxtv-commits mailing list -- linuxtv-commits@linuxtv.org
To unsubscribe send an email to linuxtv-commits-le...@linuxtv.org
%(web_page_url)slistinfo/%(_internal_name)s
