From patchwork Tue Dec 12 15:24:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Le Cuirot X-Patchwork-Id: 97955 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from am.mirrors.kernel.org ([147.75.80.249]) by www.linuxtv.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rD4ib-004eYG-U4 for patchwork@linuxtv.org; Tue, 12 Dec 2023 15:30:46 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 7392E1F21048 for ; Tue, 12 Dec 2023 15:30:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 00C977A21C; Tue, 12 Dec 2023 15:28:13 +0000 (UTC) X-Original-To: linux-media@vger.kernel.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F337FD65 for ; Tue, 12 Dec 2023 07:28:08 -0800 (PST) From: James Le Cuirot To: linux-media@vger.kernel.org Cc: James Le Cuirot Subject: [PATCH 1/2] meson: Fix building with -Dv4l-utils=false Date: Tue, 12 Dec 2023 15:24:05 +0000 Message-ID: <20231212152418.20584-1-chewi@gentoo.org> X-Mailer: git-send-email 2.42.1 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-LSpam-Score: -4.7 (----) X-LSpam-Report: No, score=-4.7 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3 autolearn=unavailable autolearn_force=no ir_bpf_enabled was referenced without being defined. Tested-by: Peter Seiderer --- 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') From patchwork Tue Dec 12 15:24:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Le Cuirot X-Patchwork-Id: 97956 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from sv.mirrors.kernel.org ([139.178.88.99]) by www.linuxtv.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rD4ie-004eYO-Kw for patchwork@linuxtv.org; Tue, 12 Dec 2023 15:30:49 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 660AD281D07 for ; Tue, 12 Dec 2023 15:30:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6D5437A223; Tue, 12 Dec 2023 15:28:17 +0000 (UTC) X-Original-To: linux-media@vger.kernel.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6706D65 for ; Tue, 12 Dec 2023 07:28:12 -0800 (PST) From: James Le Cuirot To: linux-media@vger.kernel.org Cc: James Le Cuirot Subject: [PATCH 2/2] meson: Allow documentation directory to be specified with -Ddocdir Date: Tue, 12 Dec 2023 15:24:06 +0000 Message-ID: <20231212152418.20584-2-chewi@gentoo.org> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231212152418.20584-1-chewi@gentoo.org> References: <20231212152418.20584-1-chewi@gentoo.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-LSpam-Score: -4.7 (----) X-LSpam-Report: No, score=-4.7 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3 autolearn=ham autolearn_force=no This is needed by Gentoo Linux QA. Signed-off-by: James Le Cuirot --- 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',