On Thu, Jan 13, 2011 at 09:49:33PM +0100, Matthias Kilian wrote:
> Update to ImageMagick-6.6.6-10, with help from Brad. Regression
> tests work fine on amd64, some more tests needed (I'll try to do
> arm, powerpc, mips64el).
>
> I also tried --with-modules, but this causes almost all Magick++
> regression tests to fail with a bus error.
>
> The following ports (which lib_depend on ImageMagick) still build fine:
>
> comms/xastir
> graphics/inkscape
> graphics/pecl-imagick
> graphics/ruby-rmagick
> multimedia/dvdauthor
> security/libfprint
> sysutils/login_fingerprint
> x11/kde/office3
>
> But graphics/zbar fails with:
>
> zbarimg/zbarimg_zbarimg-zbarimg.o(.text+0x1a9): In function `scan_image':
> : undefined reference to `MagickGetAuthenticPixels'
>
> Unfortunately, the amount of spare time I can spend on ports during
> the next 5 or 6 weeks is very low, so if anyone is willing to fix
> the graphics/zbar problem, please go ahead.
>
Fix build graphics/zbar. Tested on amd64.
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/zbar/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 17 Nov 2010 08:05:16 -0000 1.9
+++ Makefile 13 Jan 2011 21:56:20 -0000
@@ -2,7 +2,7 @@
COMMENT= ZBar barcode reader
DISTNAME= zbar-0.10
-REVISION= 3
+REVISION= 4
SHARED_LIBS= zbar 0.0 \
zbargtk 0.0
Index: patches/patch-zbarimg_zbarimg_c
===================================================================
RCS file: patches/patch-zbarimg_zbarimg_c
diff -N patches/patch-zbarimg_zbarimg_c
--- patches/patch-zbarimg_zbarimg_c 22 Mar 2010 21:57:58 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-zbarimg_zbarimg_c,v 1.1.1.1 2010/03/22 21:57:58 jsg Exp $
---- zbarimg/zbarimg.c.orig Sun Mar 14 18:58:25 2010
-+++ zbarimg/zbarimg.c Sun Mar 14 19:20:47 2010
-@@ -47,6 +47,8 @@
- */
- #if MagickLibVersion < 0x645
- # define MagickExportImagePixels MagickGetImagePixels
-+#else if MagickLibVersion == 0x645
-+#define MagickExportImagePixels MagickGetAuthenticPixels
- #endif
-
- static const char *note_usage =
