svn commit: r489610 - in head/graphics/zbar: . files

[Kurt Jaeger]

Author: pi
Date: Mon Jan  7 19:39:36 2019
New Revision: 489610
URL: https://svnweb.freebsd.org/changeset/ports/489610

Log:
  graphics/zbar: work with ImageMagick-7 instead of -6
  
  PR:		221391
  Submitted by:	Mikhail T. <mi at ALDAN.algebra.com>
  Approved by:	Oliver Heesakkers <dev2 at heesakkers.info> (maintainer)

Added:
  head/graphics/zbar/files/patch-zbarimg.c   (contents, props changed)
Modified:
  head/graphics/zbar/Makefile
  head/graphics/zbar/files/patch-configure

Modified: head/graphics/zbar/Makefile
==============================================================================
--- head/graphics/zbar/Makefile	Mon Jan  7 19:27:30 2019	(r489609)
+++ head/graphics/zbar/Makefile	Mon Jan  7 19:39:36 2019	(r489610)
@@ -3,7 +3,7 @@
 
 PORTNAME=	zbar
 PORTVERSION=	0.10
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -28,9 +28,12 @@ X11_USE=	XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv
 X11_CONFIGURE_ON=	--with-x=yes
 X11_CONFIGURE_OFF=	--with-x=no --without-xshm --without-xv
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-7.so:graphics/ImageMagick7
 IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick=yes
 IMAGEMAGICK_CONFIGURE_OFF=	--with-imagemagick=no
+
+# To avoid patching configure even more:
+CONFIGURE_ENV+=			ac_cv_header_wand_MagickWand_h=yes
 
 V4L_BUILD_DEPENDS=	v4l_compat>=1.0.20101027:multimedia/v4l_compat
 V4L_CONFIGURE_ON=	--enable-video=yes

Modified: head/graphics/zbar/files/patch-configure
==============================================================================
--- head/graphics/zbar/files/patch-configure	Mon Jan  7 19:27:30 2019	(r489609)
+++ head/graphics/zbar/files/patch-configure	Mon Jan  7 19:39:36 2019	(r489610)
@@ -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;}

Added: head/graphics/zbar/files/patch-zbarimg.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/zbar/files/patch-zbarimg.c	Mon Jan  7 19:39:36 2019	(r489610)
@@ -0,0 +1,12 @@
+--- 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.