All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit] package/libvips: add {image, graphics}magick optional dependencies
@ 2021-04-04 14:44 Thomas Petazzoni
  0 siblings, 0 replies; only message in thread
From: Thomas Petazzoni @ 2021-04-04 14:44 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=d2e8cd799747fab2e93273aa54631dbaceae1c12
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2021-04-04 14:44 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-04 14:44 [Buildroot] [git commit] package/libvips: add {image, graphics}magick optional dependencies Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.