summaryrefslogtreecommitdiff
path: root/graphics/zbar/files/patch-configure
diff options
context:
space:
mode:
authorKurt Jaeger <pi@FreeBSD.org>2019-01-07 19:39:36 +0000
committerKurt Jaeger <pi@FreeBSD.org>2019-01-07 19:39:36 +0000
commit050bb8464b8c1553069522f3bd2c7a929992e5b0 (patch)
tree467505440566589b9c1e887427881978cce3be83 /graphics/zbar/files/patch-configure
parentx11-toolkits/p5-Tk: Do not set CONFIGURE_ARGS twice (diff)
graphics/zbar: work with ImageMagick-7 instead of -6
PR: 221391 Submitted by: Mikhail T. <mi@ALDAN.algebra.com> Approved by: Oliver Heesakkers <dev2@heesakkers.info> (maintainer)
Notes
Notes: svn path=/head/; revision=489610
Diffstat (limited to 'graphics/zbar/files/patch-configure')
-rw-r--r--graphics/zbar/files/patch-configure6
1 files changed, 6 insertions, 0 deletions
diff --git a/graphics/zbar/files/patch-configure b/graphics/zbar/files/patch-configure
index 506e478abe9e..ea821508055f 100644
--- a/graphics/zbar/files/patch-configure
+++ b/graphics/zbar/files/patch-configure
@@ -8,3 +8,9 @@
LIBS="-ljpeg $LIBS"
else
+@@ -21736,4 +21737,5 @@
+ fi
+ MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`
++ MAGICK_CFLAGS="$MAGICK_CFLAGS -DMAGICK_MAJOR=${MAGICK_VERSION%%.*}"
+ { $as_echo "$as_me:$LINENO: using ImageMagick version $MAGICK_VERSION" >&5
+ $as_echo "$as_me: using ImageMagick version $MAGICK_VERSION" >&6;}