From patchwork Wed Oct 19 23:15:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 17649 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 9414FC0DA4 for ; Wed, 19 Oct 2022 23:16:16 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 492B462E8D; Thu, 20 Oct 2022 01:16:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1666221376; bh=vtw9zoSqNVO395XdNhpi1zojOF0HCncIvVluewn+jWM=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=01rMaOXUT/guaAEal/snFy3IUK7Izsa2H9gmI26rJxrubHEJFoYpF9uzOxtwSnwh2 iacmKnSy0qYFtb3v4b7i5rkSQ4dJGvBPgeD7/FTlmieXt6txmoKYcuBEDWf8XQ0ImI oB38RXTzmuyCJ5OIwEYgqdjaTu6xa9talH5k9CXCyT/13as7upO7QqUcduwZzjVmem xjtVtrBoQr+Hrzgnpyb+DiQ074bpFfXOwaPp7cSwoWehBMDMxcFT3qvk4X3jMKQ4zz J1gT+La4SIqsRlaxwnyp/koN9xhhBX0sL9cmSrUL6xxMn+MrixsDUpVoG/zWTvkLUL 469YsUycN6DeA== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 784BE62E7D for ; Thu, 20 Oct 2022 01:16:12 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="LhBTwT/u"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 149CF8BF for ; Thu, 20 Oct 2022 01:16:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1666221372; bh=vtw9zoSqNVO395XdNhpi1zojOF0HCncIvVluewn+jWM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=LhBTwT/u2Q36R76gppwsc0tm0arPd7leTJAf8u8NXoLP2GAGQsYYyt6DJHbVpHtH2 2/2PVtUg60GWbkiaJR+gm69hmHUY/uz/L161Cuj9h5/Ox5UPn+19mGbaP67ZEHNRy3 iTGQcVfRKIhggs6syqpvdGInpS3SA+Ux34b5omM8= To: libcamera-devel@lists.libcamera.org Date: Thu, 20 Oct 2022 02:15:36 +0300 Message-Id: <20221019231537.26880-6-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221019231537.26880-1-laurent.pinchart@ideasonboard.com> References: <20221019231537.26880-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 5/6] apps: Move libtiff dependency to src/apps/meson.build X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" libtiff is a shared dependency between cam and qcam, move it to src/apps/. The shared dependency will be used to condition compilation of source files in an upcoming application static library. Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder Reviewed-by: Kieran Bingham --- src/apps/cam/meson.build | 1 - src/apps/meson.build | 2 ++ src/apps/qcam/meson.build | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/apps/cam/meson.build b/src/apps/cam/meson.build index 4b6099ddab63..297de64fbdd9 100644 --- a/src/apps/cam/meson.build +++ b/src/apps/cam/meson.build @@ -24,7 +24,6 @@ cam_cpp_args = [] libdrm = dependency('libdrm', required : false) libjpeg = dependency('libjpeg', required : false) libsdl2 = dependency('SDL2', required : false) -libtiff = dependency('libtiff-4', required : false) if libdrm.found() cam_cpp_args += [ '-DHAVE_KMS' ] diff --git a/src/apps/meson.build b/src/apps/meson.build index 159deb0b7fc2..95f1f5190c7a 100644 --- a/src/apps/meson.build +++ b/src/apps/meson.build @@ -8,6 +8,8 @@ if not libevent.found() libevent = dependency('libevent_pthreads', required : opt_lc_compliance) endif +libtiff = dependency('libtiff-4', required : false) + subdir('lc-compliance') subdir('cam') diff --git a/src/apps/qcam/meson.build b/src/apps/qcam/meson.build index d5916d0df532..e298101e2c43 100644 --- a/src/apps/qcam/meson.build +++ b/src/apps/qcam/meson.build @@ -38,8 +38,7 @@ qcam_resources = files([ qt5_cpp_args = ['-DQT_NO_KEYWORDS'] -tiff_dep = dependency('libtiff-4', required : false) -if tiff_dep.found() +if libtiff.found() qt5_cpp_args += ['-DHAVE_TIFF'] qcam_sources += files([ '../cam/dng_writer.cpp', @@ -77,7 +76,7 @@ qcam = executable('qcam', qcam_sources, resources, dependencies : [ libatomic, libcamera_public, + libtiff, qt5_dep, - tiff_dep, ], cpp_args : qt5_cpp_args)