From fe189deeed96779f9fb8c9006a85b50034322365 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 9 May 2024 21:37:36 +0200 Subject: [PATCH] package/zbar: add the optional imagemagick dependency When ImageMagick is selected, the "zbarimg" program is compiled and installed on target. It allows to decode a QR code from an image file. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 84ad5c22d00b1cf7f2c9d9632f5e3a04efe9cddc) Signed-off-by: Peter Korsgaard --- package/zbar/zbar.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index 0e79004bb3..86f33796a2 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -18,7 +18,6 @@ ZBAR_CONF_ENV = \ LIBS=$(TARGET_NLS_LIBS) ZBAR_CONF_OPTS = \ --disable-doc \ - --without-imagemagick \ --without-qt \ --without-qt5 \ --without-gtk \ @@ -32,6 +31,13 @@ else ZBAR_CONF_OPTS += --without-dbus endif +ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y) +ZBAR_DEPENDENCIES += imagemagick +ZBAR_CONF_OPTS += --with-imagemagick +else +ZBAR_CONF_OPTS += --without-imagemagick +endif + ifeq ($(BR2_PACKAGE_PYTHON3),y) ZBAR_DEPENDENCIES += host-python3 python3 ZBAR_CONF_OPTS += --with-python=python3