Attachment 185235 Details for Bug 221391 – Do not care for ImageMagick's version

[patch] Do not care for ImageMagick's version

zbar-im7.diff (text/plain), 2.10 KB, created by Mikhail T. on 2017-08-10 15:00:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2017-08-10 15:00:13 UTC

Size: 2.10 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 447657)
>+++ Makefile	(working copy)
>@@ -28,10 +28,13 @@
> X11_CONFIGURE_ON=	--with-x=yes
> X11_CONFIGURE_OFF=	--with-x=no --without-xshm --without-xv
> 
>-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick
>+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-*.so:graphics/ImageMagick
> 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
> V4L_CONFIGURE_OFF=	--enable-video=no
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 447657)
>+++ files/patch-configure	(working copy)
>@@ -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;}
>Index: files/patch-zbarimg.c
>===================================================================
>--- files/patch-zbarimg.c	(nonexistent)
>+++ files/patch-zbarimg.c	(working copy)
>@@ -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.
>
>Property changes on: files/patch-zbarimg.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 221391: 185235 | 200964 | 200965