From d2e8cd799747fab2e93273aa54631dbaceae1c12 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Apr 2021 16:30:44 +0200 Subject: [PATCH] package/libvips: add {image, graphics}magick optional dependencies Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libvips/libvips.mk | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index f35a109502..7e8b705dd2 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -23,7 +23,6 @@ LIBVIPS_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) $(LIBVIPS_CXXFLAGS)" \ LIBVIPS_CONF_OPTS = \ --without-dmalloc \ --without-gsf \ - --without-magick \ --without-orc \ --without-lcms \ --without-OpenEXR \ @@ -52,6 +51,20 @@ else LIBVIPS_CONF_OPTS += --disable-introspection endif +ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y) +LIBVIPS_CONF_OPTS += \ + --with-magick \ + --with-magickpackage=MagickCore +LIBVIPS_DEPENDENCIES += imagemagick +else ifeq ($(BR2_PACKAGE_GRAPHICSMAGICK),y) +LIBVIPS_CONF_OPTS += \ + --with-magick \ + --with-magickpackage=GraphicsMagick +LIBVIPS_DEPENDENCIES += graphicsmagick +else +LIBVIPS_CONF_OPTS += --without-magick +endif + ifeq ($(BR2_PACKAGE_JPEG),y) LIBVIPS_CONF_OPTS += --with-jpeg LIBVIPS_DEPENDENCIES += jpeg -- 2.30.2