Re: compiling ImageMagick on NetBSD 5

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

This time attached...

On Fri, Oct 10, 2014 at 03:49:40PM +0100, Patrick Welche wrote:
> New patch as an openexr escaped in buildlink3.mk...
> 
> To quote www.openexr.com:
>  
>   OpenEXR is a high dynamic-range (HDR) image file format developed
>   by Industrial Light & Magic for use in computer imaging applications.
>  
>   OpenEXR is used by ILM on all motion pictures currently in
>   production. The first movies to employ OpenEXR were Harry Potter
>   and the Sorcerers Stone, Men in Black II, Gangs of New York, and
>   Signs. Since then, OpenEXR has become ILM's main image file
>   format.
> 
> Switch it off to see NetBSD 5 bulk builds improve and bump PKGREVISION
> or leave it on by default and don't bump PKGREVISION? (as per attached)
> 
> Cheers,
> 
> Patrick

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/ImageMagick/Makefile,v
retrieving revision 1.208
diff -u -u -r1.208 Makefile
--- Makefile	22 Aug 2014 11:24:25 -0000	1.208
+++ Makefile	10 Oct 2014 14:45:46 -0000
@@ -80,7 +80,6 @@
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/ImageMagick/buildlink3.mk,v
retrieving revision 1.54
diff -u -u -r1.54 buildlink3.mk
--- buildlink3.mk	22 Aug 2014 11:24:25 -0000	1.54
+++ buildlink3.mk	10 Oct 2014 14:45:46 -0000
@@ -21,6 +21,9 @@
 .if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mjasper)
 .include "../../graphics/jasper/buildlink3.mk"
 .endif
+.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mopenexr)
+.include "../../graphics/openexr/buildlink3.mk"
+.endif
 .if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mwmf)
 .include "../../graphics/libwmf/buildlink3.mk"
 .endif
@@ -37,7 +40,6 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/ImageMagick/options.mk,v
retrieving revision 1.14
diff -u -u -r1.14 options.mk
--- options.mk	25 Apr 2013 03:53:11 -0000	1.14
+++ options.mk	10 Oct 2014 14:45:46 -0000
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.14 2013/04/25 03:53:11 sbd Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ImageMagick
-PKG_SUPPORTED_OPTIONS=	x11 jasper djvu ghostscript wmf
-PKG_SUGGESTED_OPTIONS=	x11 jasper
+PKG_SUPPORTED_OPTIONS=	x11 jasper djvu ghostscript openexr wmf
+PKG_SUGGESTED_OPTIONS=	x11 jasper openexr
 
 .include "../../mk/bsd.options.mk"
 
@@ -36,6 +36,13 @@
 CONFIGURE_ARGS+=	--without-gslib
 .endif
 
+.if !empty(PKG_OPTIONS:Mopenexr)
+.include "../../graphics/openexr/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-openexr
+.else
+CONFIGURE_ARGS+=	--without-openexr
+.endif
+
 .if !empty(PKG_OPTIONS:Mwmf)
 .include "../../graphics/libwmf/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-wmf