Mon Oct 30 14:44:05 2017 UTC ()
graphics/ImageMagick*: Replace (optional) dependency on jasper, removed
by upstream in as early as 6.8, and replace with openjpeg - for the
purposes of JPEG 2000 (JP2) support. Bump PKGREVISION.


(fhajny)
diff -r1.230 -r1.231 pkgsrc/graphics/ImageMagick/Makefile
diff -r1.60 -r1.61 pkgsrc/graphics/ImageMagick/buildlink3.mk
diff -r1.17 -r1.18 pkgsrc/graphics/ImageMagick/options.mk
diff -r1.7 -r1.8 pkgsrc/graphics/ImageMagick6/Makefile
diff -r1.2 -r1.3 pkgsrc/graphics/ImageMagick6/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/graphics/ImageMagick6/options.mk
cvs diff -r1.230 -r1.231 pkgsrc/graphics/ImageMagick/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile 2017/09/13 08:56:18 1.230
+++ pkgsrc/graphics/ImageMagick/Makefile 2017/10/30 14:44:05 1.231
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.230 2017/09/13 08:56:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.231 2017/10/30 14:44:05 fhajny Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ImageMagick-${DISTVERSION} 5PKGNAME= ImageMagick-${DISTVERSION}
 6PKGREVISION= 1
6 7
7MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
8COMMENT= Package for display and interactive manipulation of images 9COMMENT= Package for display and interactive manipulation of images
9 10
10CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 11CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
11 12
12USE_LANGUAGES= c c++ c99 13USE_LANGUAGES= c c++ c99
13USE_TOOLS+= gmake pkg-config:run 14USE_TOOLS+= gmake pkg-config:run
14CONFIGURE_ARGS+= --disable-assert 15CONFIGURE_ARGS+= --disable-assert
15CONFIGURE_ARGS+= --with-fontconfig 16CONFIGURE_ARGS+= --with-fontconfig
16CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 17CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
17CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 18CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
18CONFIGURE_ARGS+= --with-xml=yes 19CONFIGURE_ARGS+= --with-xml=yes
cvs diff -r1.60 -r1.61 pkgsrc/graphics/ImageMagick/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/buildlink3.mk 2017/02/28 15:19:59 1.60
+++ pkgsrc/graphics/ImageMagick/buildlink3.mk 2017/10/30 14:44:05 1.61
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: buildlink3.mk,v 1.60 2017/02/28 15:19:59 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.61 2017/10/30 14:44:05 fhajny Exp $
2 2
3BUILDLINK_TREE+= ImageMagick 3BUILDLINK_TREE+= ImageMagick
4 4
5.if !defined(IMAGEMAGICK_BUILDLINK3_MK) 5.if !defined(IMAGEMAGICK_BUILDLINK3_MK)
6IMAGEMAGICK_BUILDLINK3_MK:= 6IMAGEMAGICK_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1 8BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1
9BUILDLINK_ABI_DEPENDS.ImageMagick+= ImageMagick>=7.0.5.0nb1 9BUILDLINK_ABI_DEPENDS.ImageMagick+= ImageMagick>=7.0.5.0nb1
10BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick 10BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick
11 11
12pkgbase := ImageMagick 12pkgbase := ImageMagick
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
15.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mdjvu) 15.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mdjvu)
16.include "../../graphics/djvulibre-lib/buildlink3.mk" 16.include "../../graphics/djvulibre-lib/buildlink3.mk"
17.endif 17.endif
18.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mjasper) 18.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mjp2)
19.include "../../graphics/jasper/buildlink3.mk" 19.include "../../graphics/openjpeg/buildlink3.mk"
20.endif 20.endif
21.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mopenexr) 21.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mopenexr)
22.include "../../graphics/openexr/buildlink3.mk" 22.include "../../graphics/openexr/buildlink3.mk"
23.endif 23.endif
24.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mwmf) 24.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mwmf)
25.include "../../graphics/libwmf/buildlink3.mk" 25.include "../../graphics/libwmf/buildlink3.mk"
26.endif 26.endif
27.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mx11) 27.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mx11)
28.include "../../x11/libX11/buildlink3.mk" 28.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/libXext/buildlink3.mk" 29.include "../../x11/libXext/buildlink3.mk"
30.include "../../x11/libXt/buildlink3.mk" 30.include "../../x11/libXt/buildlink3.mk"
31.endif 31.endif
32 32
cvs diff -r1.17 -r1.18 pkgsrc/graphics/ImageMagick/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/options.mk 2014/10/12 18:55:14 1.17
+++ pkgsrc/graphics/ImageMagick/options.mk 2017/10/30 14:44:05 1.18
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: options.mk,v 1.17 2014/10/12 18:55:14 dholland Exp $ 1# $NetBSD: options.mk,v 1.18 2017/10/30 14:44:05 fhajny Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick 3PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick
4PKG_SUPPORTED_OPTIONS= x11 jasper djvu openexr wmf 4PKG_SUPPORTED_OPTIONS= x11 jp2 djvu openexr wmf
5PKG_SUGGESTED_OPTIONS= x11 jasper 5PKG_SUGGESTED_OPTIONS= x11 jp2
 6PKG_OPTIONS_LEGACY_OPTS+= jasper:jp2
6 7
7.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
8 9
9.if !empty(PKG_OPTIONS:Mx11) 10.if !empty(PKG_OPTIONS:Mx11)
10.include "../../x11/libX11/buildlink3.mk" 11.include "../../x11/libX11/buildlink3.mk"
11.include "../../x11/libXext/buildlink3.mk" 12.include "../../x11/libXext/buildlink3.mk"
12.include "../../x11/libXt/buildlink3.mk" 13.include "../../x11/libXt/buildlink3.mk"
13.else 14.else
14CONFIGURE_ARGS+= --without-x 15CONFIGURE_ARGS+= --without-x
15.endif 16.endif
16 17
17.if !empty(PKG_OPTIONS:Mjasper) 18.if !empty(PKG_OPTIONS:Mjp2)
18BUILDLINK_API_DEPENDS.jasper+= jasper>=1.701.0 19.include "../../graphics/openjpeg/buildlink3.mk"
19.include "../../graphics/jasper/buildlink3.mk" 20CONFIGURE_ARGS+= --with-openjp2
20CONFIGURE_ARGS+= --with-jp2 
21.else 21.else
22CONFIGURE_ARGS+= --without-jp2 22CONFIGURE_ARGS+= --without-openjp2
23.endif 23.endif
24 24
25.if !empty(PKG_OPTIONS:Mdjvu) 25.if !empty(PKG_OPTIONS:Mdjvu)
26.include "../../graphics/djvulibre-lib/buildlink3.mk" 26.include "../../graphics/djvulibre-lib/buildlink3.mk"
27CONFIGURE_ARGS+= --with-djvu 27CONFIGURE_ARGS+= --with-djvu
28.else 28.else
29CONFIGURE_ARGS+= --without-djvu 29CONFIGURE_ARGS+= --without-djvu
30.endif 30.endif
31 31
32.if !empty(PKG_OPTIONS:Mopenexr) 32.if !empty(PKG_OPTIONS:Mopenexr)
33.include "../../graphics/openexr/buildlink3.mk" 33.include "../../graphics/openexr/buildlink3.mk"
34CONFIGURE_ARGS+= --with-openexr 34CONFIGURE_ARGS+= --with-openexr
35.else 35.else
cvs diff -r1.7 -r1.8 pkgsrc/graphics/ImageMagick6/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick6/Makefile 2017/09/09 12:09:37 1.7
+++ pkgsrc/graphics/ImageMagick6/Makefile 2017/10/30 14:44:05 1.8
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.7 2017/09/09 12:09:37 ryoon Exp $ 1# $NetBSD: Makefile,v 1.8 2017/10/30 14:44:05 fhajny Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ImageMagick6-${DISTVERSION} 5PKGNAME= ImageMagick6-${DISTVERSION}
 6PKGREVISION= 1
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Package for display and interactive manipulation of images 9COMMENT= Package for display and interactive manipulation of images
9 10
10CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 11CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
11 12
12USE_LANGUAGES= c c++ c99 13USE_LANGUAGES= c c++ c99
13USE_TOOLS+= gmake pkg-config:run 14USE_TOOLS+= gmake pkg-config:run
14CONFIGURE_ARGS+= --disable-assert 15CONFIGURE_ARGS+= --disable-assert
15CONFIGURE_ARGS+= --with-fontconfig 16CONFIGURE_ARGS+= --with-fontconfig
16CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 17CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
17CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 18CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
18CONFIGURE_ARGS+= --with-xml=yes 19CONFIGURE_ARGS+= --with-xml=yes
cvs diff -r1.2 -r1.3 pkgsrc/graphics/ImageMagick6/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick6/buildlink3.mk 2017/02/28 15:19:59 1.2
+++ pkgsrc/graphics/ImageMagick6/buildlink3.mk 2017/10/30 14:44:05 1.3
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: buildlink3.mk,v 1.2 2017/02/28 15:19:59 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2017/10/30 14:44:05 fhajny Exp $
2 2
3BUILDLINK_TREE+= ImageMagick6 3BUILDLINK_TREE+= ImageMagick6
4 4
5.if !defined(IMAGEMAGICK6_BUILDLINK3_MK) 5.if !defined(IMAGEMAGICK6_BUILDLINK3_MK)
6IMAGEMAGICK6_BUILDLINK3_MK:= 6IMAGEMAGICK6_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ImageMagick6+= ImageMagick6>=5.5.7.11nb1 8BUILDLINK_API_DEPENDS.ImageMagick6+= ImageMagick6>=5.5.7.11nb1
9BUILDLINK_ABI_DEPENDS.ImageMagick6+= ImageMagick6>=6.9.7.9nb1 9BUILDLINK_ABI_DEPENDS.ImageMagick6+= ImageMagick6>=6.9.7.9nb1
10BUILDLINK_PKGSRCDIR.ImageMagick6?= ../../graphics/ImageMagick6 10BUILDLINK_PKGSRCDIR.ImageMagick6?= ../../graphics/ImageMagick6
11 11
12pkgbase := ImageMagick6 12pkgbase := ImageMagick6
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
15.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mdjvu) 15.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mdjvu)
16.include "../../graphics/djvulibre-lib/buildlink3.mk" 16.include "../../graphics/djvulibre-lib/buildlink3.mk"
17.endif 17.endif
18.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mjasper) 18.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mjp2)
19.include "../../graphics/jasper/buildlink3.mk" 19.include "../../graphics/openjpeg/buildlink3.mk"
20.endif 20.endif
21.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mopenexr) 21.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mopenexr)
22.include "../../graphics/openexr/buildlink3.mk" 22.include "../../graphics/openexr/buildlink3.mk"
23.endif 23.endif
24.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mwmf) 24.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mwmf)
25.include "../../graphics/libwmf/buildlink3.mk" 25.include "../../graphics/libwmf/buildlink3.mk"
26.endif 26.endif
27.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mx11) 27.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mx11)
28.include "../../x11/libX11/buildlink3.mk" 28.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/libXext/buildlink3.mk" 29.include "../../x11/libXext/buildlink3.mk"
30.include "../../x11/libXt/buildlink3.mk" 30.include "../../x11/libXt/buildlink3.mk"
31.endif 31.endif
32 32
cvs diff -r1.1 -r1.2 pkgsrc/graphics/ImageMagick6/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick6/options.mk 2016/05/25 12:41:17 1.1
+++ pkgsrc/graphics/ImageMagick6/options.mk 2017/10/30 14:44:05 1.2
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: options.mk,v 1.1 2016/05/25 12:41:17 ryoon Exp $ 1# $NetBSD: options.mk,v 1.2 2017/10/30 14:44:05 fhajny Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick 3PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick
4PKG_SUPPORTED_OPTIONS= x11 jasper djvu openexr wmf 4PKG_SUPPORTED_OPTIONS= x11 jp2 djvu openexr wmf
5PKG_SUGGESTED_OPTIONS= x11 jasper 5PKG_SUGGESTED_OPTIONS= x11 jp2
 6PKG_OPTIONS_LEGACY_OPTS+= jasper:jp2
6 7
7.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
8 9
9.if !empty(PKG_OPTIONS:Mx11) 10.if !empty(PKG_OPTIONS:Mx11)
10.include "../../x11/libX11/buildlink3.mk" 11.include "../../x11/libX11/buildlink3.mk"
11.include "../../x11/libXext/buildlink3.mk" 12.include "../../x11/libXext/buildlink3.mk"
12.include "../../x11/libXt/buildlink3.mk" 13.include "../../x11/libXt/buildlink3.mk"
13.else 14.else
14CONFIGURE_ARGS+= --without-x 15CONFIGURE_ARGS+= --without-x
15.endif 16.endif
16 17
17.if !empty(PKG_OPTIONS:Mjasper) 18.if !empty(PKG_OPTIONS:Mjp2)
18BUILDLINK_API_DEPENDS.jasper+= jasper>=1.701.0 19.include "../../graphics/openjpeg/buildlink3.mk"
19.include "../../graphics/jasper/buildlink3.mk" 20CONFIGURE_ARGS+= --with-openjp2
20CONFIGURE_ARGS+= --with-jp2 
21.else 21.else
22CONFIGURE_ARGS+= --without-jp2 22CONFIGURE_ARGS+= --without-openjp2
23.endif 23.endif
24 24
25.if !empty(PKG_OPTIONS:Mdjvu) 25.if !empty(PKG_OPTIONS:Mdjvu)
26.include "../../graphics/djvulibre-lib/buildlink3.mk" 26.include "../../graphics/djvulibre-lib/buildlink3.mk"
27CONFIGURE_ARGS+= --with-djvu 27CONFIGURE_ARGS+= --with-djvu
28.else 28.else
29CONFIGURE_ARGS+= --without-djvu 29CONFIGURE_ARGS+= --without-djvu
30.endif 30.endif
31 31
32.if !empty(PKG_OPTIONS:Mopenexr) 32.if !empty(PKG_OPTIONS:Mopenexr)
33.include "../../graphics/openexr/buildlink3.mk" 33.include "../../graphics/openexr/buildlink3.mk"
34CONFIGURE_ARGS+= --with-openexr 34CONFIGURE_ARGS+= --with-openexr
35.else 35.else