Attachment #200965 for bug #221391

Lines 3-9 Link Here

(-)Makefile (-9 / +19 lines)
3		3
4	PORTNAME= zbar	4	PORTNAME= zbar
5	PORTVERSION= 0.10	5	PORTVERSION= 0.10
6	PORTREVISION= 16	6	PORTREVISION= 17
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9
Lines 12-26 Link Here
12		12
13	LICENSE= LGPL21	13	LICENSE= LGPL21
14		14
		15	USES= iconv jpeg libtool gmake pathfix pkgconfig
		16	USE_LDCONFIG= yes
		17
15	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
16	USE_LDCONFIG= yes
17	USES= iconv jpeg libtool gmake pathfix pkgconfig
18	INSTALL_TARGET= install-strip	19	INSTALL_TARGET= install-strip
19
20	CONFIGURE_ARGS= --with-jpeg=yes	20	CONFIGURE_ARGS= --with-jpeg=yes
21		21
22	OPTIONS_DEFINE= X11 IMAGEMAGICK V4L PYTHON GTK2 QT4 DOCS	22	OPTIONS_DEFINE= X11 V4L PYTHON GTK2 QT4 DOCS
23	OPTIONS_DEFAULT=X11 IMAGEMAGICK	23	OPTIONS_DEFAULT=X11 V7
		24	OPTIONS_RADIO= IMAGEMAGICK
		25	OPTIONS_RADIO_IMAGEMAGICK= V6 V7
24	OPTIONS_SUB= yes	26	OPTIONS_SUB= yes
25	V4L_DESC= Build zbarcam video scanner	27	V4L_DESC= Build zbarcam video scanner
26		28
Lines 28-37 Link Here
28	X11_CONFIGURE_ON= --with-x=yes	30	X11_CONFIGURE_ON= --with-x=yes
29	X11_CONFIGURE_OFF= --with-x=no --without-xshm --without-xv	31	X11_CONFIGURE_OFF= --with-x=no --without-xshm --without-xv
30		32
31	IMAGEMAGICK_LIB_DEPENDS= libMagick++-7.so:graphics/ImageMagick7	33	V6_DESC= With ImageMagick6
32	IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick=yes	34	V6_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6
33	IMAGEMAGICK_CONFIGURE_OFF= --with-imagemagick=no	35	V6_CONFIGURE_ON= --with-imagemagick=yes
34		36
		37	V7_DESC= With ImageMagick7
		38	V7_LIB_DEPENDS= libMagick++-7.so:graphics/ImageMagick7
		39	V7_CONFIGURE_ON= --with-imagemagick=yes
		40
		41	.if empty(VARIABLE:MV6) && empty(VARIABLE:MV7)
		42	CONFIGURE_ARGS+= --with-imagemagick=no
		43	.endif
		44
35	# To avoid patching configure even more:	45	# To avoid patching configure even more:
36	CONFIGURE_ENV+= ac_cv_header_wand_MagickWand_h=yes	46	CONFIGURE_ENV+= ac_cv_header_wand_MagickWand_h=yes
37		47

Lines 1-8 Link Here

(-)files/patch-Makefile.in (-4 / +4 lines)
1	--- Makefile.in.orig 2010-12-09 17:52:23.862954369 +0000	1	--- Makefile.in.orig 2019-01-09 19:05:01 UTC
2	+++ Makefile.in 2010-12-09 17:53:00.865045766 +0000	2	+++ Makefile.in
3	@@ -697,7 +697,7 @@	3	@@ -697,7 +697,7 @@ EXTRA_DIST = $(am__append_33) $(am__append_39) $(am__a
4	perl/t/Scanner.t perl/t/pod.t perl/t/pod-coverage.t	4	perl/t/Scanner.t perl/t/pod.t perl/t/pod-coverage.t
5	pkgconfigdir = $(libdir)/pkgconfig	5	pkgconfigdir = $(prefix)/libdata/pkgconfig
6	pkgconfig_DATA = zbar.pc $(am__append_44) $(am__append_52)	6	pkgconfig_DATA = zbar.pc $(am__append_44) $(am__append_52)
7	-dist_doc_DATA = COPYING HACKING INSTALL LICENSE NEWS README TODO \	7	-dist_doc_DATA = COPYING HACKING INSTALL LICENSE NEWS README TODO \
8	+dist_doc_DATA = HACKING INSTALL NEWS README TODO \	8	+dist_doc_DATA = HACKING INSTALL NEWS README TODO \




--- configure.orig	2009-10-23 18:17:24 UTC
+++ configure
@@ -21369,6 +21369,7 @@ if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; 
 #define HAVE_LIBJPEG 1
 _ACEOF
 

   LIBS="-ljpeg $LIBS"
 
 else
@@ -21735,6 +21736,7 @@ $as_echo "yes" >&6; }
 	:
 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;}
 




--- 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.

Lines 1-6 Link Here

(-)files/patch-zbarimg_zbarimg.c (-3 / +5 lines)
1	--- zbarimg/zbarimg.c 2009-10-23 14:16:44.000000000 -0400	1	--- zbarimg/zbarimg.c.orig 2009-10-23 18:16:44 UTC
2	+++ zbarimg/zbarimg.c 2017-08-10 10:22:08.707599000 -0400	2	+++ zbarimg/zbarimg.c
3	@@ -39,5 +39,9 @@	3	@@ -38,7 +38,11 @@
		4	#include <assert.h>
4		5
5	#include <zbar.h>	6	#include <zbar.h>
6	+#if MAGICK_MAJOR < 7	7	+#if MAGICK_MAJOR < 7
Lines 10-12 Link Here
10	+#endif	11	+#endif
11		12
12	/* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.	13	/* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.
		14	* (still not sure this check is quite right...

Lines 1-5 Link Here

(-)pkg-plist (-2 / +4 lines)
1	%%V4L%%bin/zbarcam	1	%%V4L%%bin/zbarcam
2	%%IMAGEMAGICK%%bin/zbarimg	2	%%V6%%bin/zbarimg
		3	%%V7%%bin/zbarimg
3	include/zbar.h	4	include/zbar.h
4	include/zbar/Decoder.h	5	include/zbar/Decoder.h
5	include/zbar/Exception.h	6	include/zbar/Exception.h
Lines 29-35 Link Here
29	%%QT4%%libdata/pkgconfig/zbar-qt.pc	30	%%QT4%%libdata/pkgconfig/zbar-qt.pc
30	libdata/pkgconfig/zbar.pc	31	libdata/pkgconfig/zbar.pc
31	%%V4L%%man/man1/zbarcam.1.gz	32	%%V4L%%man/man1/zbarcam.1.gz
32	%%IMAGEMAGICK%%man/man1/zbarimg.1.gz	33	%%V6%%man/man1/zbarimg.1.gz
		34	%%V7%%man/man1/zbarimg.1.gz
33	%%PYTHON%%%%PYTHON_SITELIBDIR%%/zbar.so	35	%%PYTHON%%%%PYTHON_SITELIBDIR%%/zbar.so
34	%%PYTHON%%%%GTK2%%%%PYTHON_SITELIBDIR%%/zbarpygtk.so	36	%%PYTHON%%%%GTK2%%%%PYTHON_SITELIBDIR%%/zbarpygtk.so
35	%%PORTDOCS%%%%DOCSDIR%%/HACKING	37	%%PORTDOCS%%%%DOCSDIR%%/HACKING

Return to bug 221391

Lines 1-6 Link Here

(-)files/patch-configure (-3 / +5 lines)
1	--- configure.orig 2009-10-23 18:17:24.000000000 +0000	1	--- configure.orig 2009-10-23 18:17:24 UTC
2	+++ configure	2	+++ configure
3	@@ -21369,6 +21369,7 @@ if test "x$ac_cv_lib_jpeg_jpeg_read_head	3	@@ -21369,6 +21369,7 @@ if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes;
4	#define HAVE_LIBJPEG 1	4	#define HAVE_LIBJPEG 1
5	_ACEOF	5	_ACEOF
6		6
Lines 8-16 Link Here
8	LIBS="-ljpeg $LIBS"	8	LIBS="-ljpeg $LIBS"
9		9
10	else	10	else
11	@@ -21736,4 +21737,5 @@	11	@@ -21735,6 +21736,7 @@ $as_echo "yes" >&6; }
		12	:
12	fi	13	fi
13	MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`	14	MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`
14	+ MAGICK_CFLAGS="$MAGICK_CFLAGS -DMAGICK_MAJOR=${MAGICK_VERSION%%.*}"	15	+ 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:$LINENO: using ImageMagick version $MAGICK_VERSION" >&5
16	$as_echo "$as_me: using ImageMagick version $MAGICK_VERSION" >&6;}	17	$as_echo "$as_me: using ImageMagick version $MAGICK_VERSION" >&6;}
		18

Lines 1-12 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.