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 <ch...@gentoo.org> Date: Tue Dec 12 15:24:06 2023 +0000 This is needed by Gentoo Linux QA. Signed-off-by: James Le Cuirot <ch...@gentoo.org> Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> 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
