[PATCH 1/2] meson: Fix building with -Dv4l-utils=false

[PATCH 1/2] meson: Fix building with -Dv4l-utils=false

[James Le Cuirot]

ir_bpf_enabled was referenced without being defined.
---
 meson.build | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meson.build b/meson.build
index 03508bc8..d9689d35 100644
--- a/meson.build
+++ b/meson.build
@@ -382,6 +382,8 @@ subdir('lib')
 if get_option('v4l-utils')
     subdir('utils')
     subdir('contrib')
+else
+    ir_bpf_enabled = false
 endif
 
 subdir('doc')
-- 
2.42.1

[PATCH 2/2] meson: Allow documentation directory to be specified with -Ddocdir

[James Le Cuirot]

This is needed by Gentoo Linux QA.

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
 doc/meson.build   | 2 +-
 meson.build       | 5 +++++
 meson_options.txt | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/meson.build b/doc/meson.build
index 8f4437e7..4b23c3de 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 d9689d35..af243cbd 100644
--- a/meson.build
+++ b/meson.build
@@ -306,6 +306,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 2fa046c0..53cf832f 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',
-- 
2.42.1

Re: [PATCH 1/2] meson: Fix building with -Dv4l-utils=false

[Peter Seiderer]

On Tue, 12 Dec 2023 15:24:05 +0000, James Le Cuirot <chewi@gentoo.org> wrote:

> ir_bpf_enabled was referenced without being defined.
> ---
>  meson.build | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/meson.build b/meson.build
> index 03508bc8..d9689d35 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -382,6 +382,8 @@ subdir('lib')
>  if get_option('v4l-utils')
>      subdir('utils')
>      subdir('contrib')
> +else
> +    ir_bpf_enabled = false
>  endif
>
>  subdir('doc')

Can confirm the following error/failure without the patch (using
buildroot where v4l-utils is known as libv4l package)

  .../libv4l-1.26.0/meson.build:406:32: ERROR: Unknown variable "ir_bpf_enabled".

and no error with the patch applied, so you can add my

Tested-by: Peter Seiderer <ps.report@gmx.net>

Regards,
Peter