From patchwork Mon Oct 17 17:17:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 17613 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 12238BD16B for ; Mon, 17 Oct 2022 17:17:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CA3F462E06; Mon, 17 Oct 2022 19:17:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1666027077; bh=Dynt4aSTrF/HPAJjzwj+8JFdVMDMnt0Iv/0JnnaSnPE=; 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=0mdu2ALML+xwEVgeDMEyLtawsjBbSIqfz1JHZXTY5EP8MiJ8sC8sMF1h/hDkSMLlR Y27V+Z7pYwuxrRF5ehuNtlwL+PAB+tkxIFfkPPWm3t5d9d6Cc0jRbR77L8RdirqwKz reexLUgKZNB9U0VcQlfH5QKjr9JChwJDQpOtw1TRvAO1kg56tuUe1QkNA1vdItw4/B JBcwg+cha/bwRODHLrKFEejy11rbXZ23TRUIcZiKcl6qWGqNarvKEqFtEPa503frZ/ rHkCupV5onaqZgia8U3dWEGfjFAQJHvVWWCeIFIoqlaBzLnJs0m192bq2a+/7lQvSk /xjFEWqcLa3ug== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D95BC62DF7 for ; Mon, 17 Oct 2022 19:17:55 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="mRwWkaJ3"; dkim-atps=neutral Received: from pyrite.rasen.tech (h175-177-042-159.catv02.itscom.jp [175.177.42.159]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 618071056; Mon, 17 Oct 2022 19:17:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1666027075; bh=Dynt4aSTrF/HPAJjzwj+8JFdVMDMnt0Iv/0JnnaSnPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mRwWkaJ3evt19j2hszmi5ZBlSQXLrFH0QE3V87pv9Gmj5i3WCNFt8wyQGgrAl5nPA BlfakBZpMAkBaMwPyLOxnptTbfxfrpNOjy+x7ByV/1V/KKngYgHIDBcD7X9oDVCV0y ypYuJSVQCtmzq13UvWrDySxo4gumZUTL5zOmn6So= To: libcamera-devel@lists.libcamera.org Date: Tue, 18 Oct 2022 02:17:39 +0900 Message-Id: <20221017171741.3803909-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221017171741.3803909-1-paul.elder@ideasonboard.com> References: <20221017171741.3803909-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] qcam, cam: Move DNGWriter from qcam to cam 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: Paul Elder via libcamera-devel From: Paul Elder Reply-To: Paul Elder Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" To prepare for adding DNG support to cam, move DNGWriter from qcam to cam so that we only have inclusions from qcam to cam and not the other way around. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- src/{qcam => cam}/dng_writer.cpp | 0 src/{qcam => cam}/dng_writer.h | 0 src/cam/meson.build | 9 +++++++++ src/qcam/main_window.cpp | 2 +- src/qcam/meson.build | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) rename src/{qcam => cam}/dng_writer.cpp (100%) rename src/{qcam => cam}/dng_writer.h (100%) diff --git a/src/qcam/dng_writer.cpp b/src/cam/dng_writer.cpp similarity index 100% rename from src/qcam/dng_writer.cpp rename to src/cam/dng_writer.cpp diff --git a/src/qcam/dng_writer.h b/src/cam/dng_writer.h similarity index 100% rename from src/qcam/dng_writer.h rename to src/cam/dng_writer.h diff --git a/src/cam/meson.build b/src/cam/meson.build index 8259239f..06dbea06 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -26,6 +26,7 @@ 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' ] @@ -51,6 +52,13 @@ if libsdl2.found() endif endif +if libtiff.found() + cam_cpp_args += ['-DHAVE_TIFF'] + cam_sources += files([ + 'dng_writer.cpp', + ]) +endif + cam = executable('cam', cam_sources, dependencies : [ libatomic, @@ -59,6 +67,7 @@ cam = executable('cam', cam_sources, libevent, libjpeg, libsdl2, + libtiff, libyaml, ], cpp_args : cam_cpp_args, diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index e0e5092e..f553ccb0 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -26,10 +26,10 @@ #include #include +#include "../cam/dng_writer.h" #include "../cam/image.h" #include "cam_select_dialog.h" -#include "dng_writer.h" #ifndef QT_NO_OPENGL #include "viewfinder_gl.h" #endif diff --git a/src/qcam/meson.build b/src/qcam/meson.build index 61861ea6..9f5759ff 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -49,7 +49,7 @@ if tiff_dep.found() qt5_cpp_args += ['-DHAVE_TIFF'] qcam_deps += [tiff_dep] qcam_sources += files([ - 'dng_writer.cpp', + '../cam/dng_writer.cpp', ]) endif