Attachment #185235 for bug #221391

Lines 28-37 Link Here

(-)Makefile (-1 / +4 lines)
28	X11_CONFIGURE_ON= --with-x=yes	28	X11_CONFIGURE_ON= --with-x=yes
29	X11_CONFIGURE_OFF= --with-x=no --without-xshm --without-xv	29	X11_CONFIGURE_OFF= --with-x=no --without-xshm --without-xv
30		30
31	IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick	31	IMAGEMAGICK_LIB_DEPENDS= libMagick++-*.so:graphics/ImageMagick
32	IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick=yes	32	IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick=yes
33	IMAGEMAGICK_CONFIGURE_OFF= --with-imagemagick=no	33	IMAGEMAGICK_CONFIGURE_OFF= --with-imagemagick=no
34		34
		35	# To avoid patching configure even more:
		36	CONFIGURE_ENV+= ac_cv_header_wand_MagickWand_h=yes
		37
35	V4L_BUILD_DEPENDS= v4l_compat>=1.0.20101027:multimedia/v4l_compat	38	V4L_BUILD_DEPENDS= v4l_compat>=1.0.20101027:multimedia/v4l_compat
36	V4L_CONFIGURE_ON= --enable-video=yes	39	V4L_CONFIGURE_ON= --enable-video=yes
37	V4L_CONFIGURE_OFF= --enable-video=no	40	V4L_CONFIGURE_OFF= --enable-video=no

Lines 8-10 Link Here

(-)files/patch-configure (+6 lines)
8	LIBS="-ljpeg $LIBS"	8	LIBS="-ljpeg $LIBS"
9		9
10	else	10	else
		11	@@ -21736,4 +21737,5 @@
		12	fi
		13	MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`
		14	+ MAGICK_CFLAGS="$MAGICK_CFLAGS -DMAGICK_MAJOR=${MAGICK_VERSION%%.*}"
		15	{ $as_echo "$as_me:$LINENO: using ImageMagick version $MAGICK_VERSION" >&5
		16	$as_echo "$as_me: using ImageMagick version $MAGICK_VERSION" >&6;}




--- zbarimg/zbarimg.c	2009-10-23 14:16:44.000000000 -0400
+++ zbarimg/zbarimg.c	2017-08-10 10:22:08.707599000 -0400
@@ -39,5 +39,9 @@
 
 #include <zbar.h>
+#if MAGICK_MAJOR < 7
 #include <wand/MagickWand.h>
+#else
+#include <MagickWand/MagickWand.h>
+#endif
 
 /* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.

Return to bug 221391

Line 0 Link Here

(-)files/patch-zbarimg.c (+12 lines)
	1	--- zbarimg/zbarimg.c 2009-10-23 14:16:44.000000000 -0400
	2	+++ zbarimg/zbarimg.c 2017-08-10 10:22:08.707599000 -0400
	3	@@ -39,5 +39,9 @@
	4
	5	#include <zbar.h>
	6	+#if MAGICK_MAJOR < 7
	7	#include <wand/MagickWand.h>
	8	+#else
	9	+#include <MagickWand/MagickWand.h>
	10	+#endif
	11
	12	/* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.