Browse Source

Replace libtiff dependency by libdng

Martijn Braam 1 year ago
parent
commit
aba8eace21
2 changed files with 7 additions and 6 deletions
  1. 5 4
      CMakeLists.txt
  2. 2 2
      meson.build

+ 5 - 4
CMakeLists.txt

@@ -11,6 +11,7 @@ PKG_CHECK_MODULES(TIFF REQUIRED libtiff-4)
 PKG_CHECK_MODULES(ZBAR REQUIRED zbar)
 PKG_CHECK_MODULES(EPOXY REQUIRED epoxy)
 PKG_CHECK_MODULES(MEGAPIXELS REQUIRED libmegapixels)
+PKG_CHECK_MODULES(DNG REQUIRED libdng)
 PKG_CHECK_MODULES(XLIB REQUIRED x11)
 PKG_CHECK_MODULES(XRANDR REQUIRED xrandr)
 PKG_CHECK_MODULES(WAYLAND REQUIRED wayland-client)
@@ -20,7 +21,7 @@ PKG_CHECK_MODULES(WAYLAND REQUIRED wayland-client)
 INCLUDE_DIRECTORIES(
         ${GTK4_INCLUDE_DIRS}
         ${FEEDBACK_INCLUDE_DIRS}
-        ${TIFF_INCLUDE_DIRS}
+        ${DNG_INCLUDE_DIRS}
         ${ZBAR_INCLUDE_DIRS}
         ${EPOXY_INCLUDE_DIRS}
         ${MEGAPIXELS_INCLUDE_DIRS}
@@ -31,7 +32,7 @@ INCLUDE_DIRECTORIES(
 LINK_DIRECTORIES(
         ${GTK4_LIBRARY_DIRS}
         ${FEEDBACK_LIBRARY_DIRS}
-        ${TIFF_LIBRARY_DIRS}
+        ${DNG_LIBRARY_DIRS}
         ${ZBAR_LIBRARY_DIRS}
         ${EPOXY_LIBRARY_DIRS}
         ${MEGAPIXELS_LIBRARY_DIRS}
@@ -44,7 +45,7 @@ LINK_DIRECTORIES(
 ADD_DEFINITIONS(
         ${GTK4_CFLAGS_OTHER}
         ${FEEDBACK_CFLAGS_OTHER}
-        ${TIFF_CFLAGS_OTHER}
+        ${DNG_CFLAGS_OTHER}
         ${ZBAR_CFLAGS_OTHER}
         ${EPOXY_CFLAGS_OTHER}
         ${MEGAPIXELS_CFLAGS_OTHER}
@@ -85,7 +86,7 @@ target_link_libraries(megapixels-gtk
         m
         ${GTK4_LIBRARIES}
         ${FEEDBACK_LIBRARIES}
-        ${TIFF_LIBRARIES}
+        ${DNG_LIBRARIES}
         ${ZBAR_LIBRARIES}
         ${EPOXY_LIBRARIES}
         ${MEGAPIXELS_LIBRARIES}

+ 2 - 2
meson.build

@@ -3,13 +3,13 @@ project('megapixels', 'c', version: '2.0.0')
 gnome = import('gnome')
 gtkdep = dependency('gtk4')
 libfeedback = dependency('libfeedback-0.0')
-tiff = dependency('libtiff-4')
 zbar = dependency('zbar')
 threads = dependency('threads')
 # gl = dependency('gl')
 epoxy      = dependency('epoxy')
 
 libmp = dependency('libmegapixels')
+libdng = dependency('libdng')
 
 # We only build in support for Wayland/X11 if GTK did so
 optdeps = []
@@ -63,7 +63,7 @@ executable('megapixels',
   'src/dcp.c',
   resources,
   include_directories: 'src/',
-  dependencies: [gtkdep, libfeedback, libm, tiff, zbar, threads, epoxy, libmp] + optdeps,
+  dependencies: [gtkdep, libfeedback, libm, zbar, threads, epoxy, libmp, libdng] + optdeps,
   install: true,
   link_args: '-Wl,-ldl')