From bb394442abf0f1bcb70fa6a48e3949da79703a71 Mon Sep 17 00:00:00 2001
From: Paul Elder <paul.elder@ideasonboard.com>
Date: Thu, 13 Oct 2022 19:47:22 +0900
Subject: [PATCH] qcam, cam: Move DNGWriter from qcam to cam

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 <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/{qcam => cam}/dng_writer.cpp | 0
 src/{qcam => cam}/dng_writer.h   | 0
 src/cam/meson.build              | 1 +
 src/qcam/main_window.cpp         | 2 +-
 src/qcam/meson.build             | 2 +-
 5 files changed, 3 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..9c766221 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' ]
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 <QToolButton>
 #include <QtDebug>
 
+#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