From f947109f92a2c469da4fe9f73df351dccbe51ac8 Mon Sep 17 00:00:00 2001
From: Alx Sa <cmyk.student@gmail.com>
Date: Sat, 27 May 2023 12:51:21 +0000
Subject: [PATCH] build: Enable IFF format on Windows

Now that libiff and libilbm have been added to the MSYS2 repositories,
the plug-in can be built automatically on Windows.
---
 build/windows/gitlab-ci/build-deps-crossroad.sh | 2 ++
 build/windows/gitlab-ci/build-gimp-msys2.sh     | 2 ++
 meson.build                                     | 8 +++++++-
 plug-ins/common/meson.build                     | 7 ++++++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/build/windows/gitlab-ci/build-deps-crossroad.sh b/build/windows/gitlab-ci/build-deps-crossroad.sh
index 62cd6c86b9..fd41db679b 100644
--- a/build/windows/gitlab-ci/build-deps-crossroad.sh
+++ b/build/windows/gitlab-ci/build-deps-crossroad.sh
@@ -40,6 +40,8 @@ crossroad install appstream-glib              \
                   gobject-introspection-runtime \
                   iso-codes                   \
                   libheif                     \
+                  libiff                      \
+                  libilbm                     \
                   libjxl                      \
                   $LIBMNG                     \
                   libmypaint mypaint-brushes  \
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index 7f000daa9f..0ecacf8ae4 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -50,6 +50,8 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-lensfun \
     mingw-w64-$MSYS2_ARCH-libarchive \
     mingw-w64-$MSYS2_ARCH-libheif \
+    mingw-w64-$MSYS2_ARCH-libiff \
+    mingw-w64-$MSYS2_ARCH-libilbm \
     mingw-w64-$MSYS2_ARCH-libjxl \
     mingw-w64-$MSYS2_ARCH-libmypaint \
     mingw-w64-$MSYS2_ARCH-libspiro \
diff --git a/meson.build b/meson.build
index 3a7d902632..b5f777bf9d 100644
--- a/meson.build
+++ b/meson.build
@@ -718,7 +718,13 @@ if have_qoi
   MIMEtypes += 'image/qoi'
 endif
 
-have_ilbm = cc.has_header('libilbm/ilbm.h', required: get_option('ilbm'))
+libiff = dependency('libiff', required: get_option('ilbm'))
+libilbm = dependency('libilbm', required: get_option('ilbm'))
+if libiff.found() and libilbm.found()
+  have_ilbm = true
+else
+  have_ilbm = cc.has_header('libilbm/ilbm.h', required: get_option('ilbm'))
+endif
 if have_ilbm
   MIMEtypes += 'image/x-ilbm'
 endif
diff --git a/plug-ins/common/meson.build b/plug-ins/common/meson.build
index 6ca184b6f1..2b10fefac6 100644
--- a/plug-ins/common/meson.build
+++ b/plug-ins/common/meson.build
@@ -160,7 +160,12 @@ if have_qoi
   }
 endif
 
-if have_ilbm
+if libiff.found() and libilbm.found()
+  common_plugins_list += {
+    'name': 'file-iff',
+    'deps': [ gtk3, gegl, libiff, libilbm, ],
+  }
+elif have_ilbm
   common_plugins_list += {
     'name': 'file-iff',
     'deps': [ gtk3, gegl, ],