Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove jasper option from ImageMagick6 #31

Closed
wants to merge 1 commit into from
Closed

Remove jasper option from ImageMagick6 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion graphics/ImageMagick6/Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# since they disappear immediately when new releases happen.

IM_MAJOR_VER= 6.9.9
IM_MINOR_VER= 12
IM_MINOR_VER= 20
IM_MAJOR_LIB_VER= 6

.if (${IM_MINOR_VER} != NONE)
Expand Down
1 change: 1 addition & 0 deletions graphics/ImageMagick6/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,3 +1213,4 @@ share/examples/ImageMagick6/type-dejavu.xml
share/examples/ImageMagick6/type-ghostscript.xml
share/examples/ImageMagick6/type-windows.xml
share/examples/ImageMagick6/type.xml
share/examples/ImageMagick6/type-urw-base35.xml
4 changes: 2 additions & 2 deletions graphics/ImageMagick6/buildlink3.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ pkgbase := ImageMagick6
.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mdjvu)
.include "../../graphics/djvulibre-lib/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mjasper)
.include "../../graphics/jasper/buildlink3.mk"
.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mjp2)
.include "../../graphics/openjpeg/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mopenexr)
.include "../../graphics/openexr/buildlink3.mk"
Expand Down
8 changes: 4 additions & 4 deletions graphics/ImageMagick6/distinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.7 2017/09/11 01:18:45 ryoon Exp $

SHA1 (ImageMagick-6.9.9-12.tar.xz) = 7f9d9ec64e7054c698d691bbb474500d3e29115b
RMD160 (ImageMagick-6.9.9-12.tar.xz) = 9f105944d71ec580353712eb83c026a4fefbf202
SHA512 (ImageMagick-6.9.9-12.tar.xz) = b4a876ce6310c0cbcb915ab1f7bfbeebdce47c7758f43e563cba01b5673db387768b6e65efe8915be8e06745c4a5ed2691a761baf4d52c04126a7c98362e3ef2
Size (ImageMagick-6.9.9-12.tar.xz) = 8788428 bytes
SHA1 (ImageMagick-6.9.9-20.tar.xz) = 551b9684a0ec02b8993f59ed127cd13d976516a6
RMD160 (ImageMagick-6.9.9-20.tar.xz) = f52fe28e5988d08083428d1a21fae8921f9526b0
SHA512 (ImageMagick-6.9.9-20.tar.xz) = 36c241490ee41de5cd72e5bc297ac2353a0d4574337776445798b0c5823f491304c3f3a728d420d03f66b652eafcdb68ec2992347321ac3919c1d72c0afdb849
Size (ImageMagick-6.9.9-20.tar.xz) = 8994128 bytes
SHA1 (patch-Makefile.in) = bb747b5e062f2a59e307289b5b33861dd5f96ab0
9 changes: 4 additions & 5 deletions graphics/ImageMagick6/options.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# $NetBSD: options.mk,v 1.1 2016/05/25 12:41:17 ryoon Exp $

PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick
PKG_SUPPORTED_OPTIONS= x11 jasper djvu openexr wmf
PKG_SUGGESTED_OPTIONS= x11 jasper
PKG_SUPPORTED_OPTIONS= x11 jp2 djvu openexr wmf
PKG_SUGGESTED_OPTIONS= x11

.include "../../mk/bsd.options.mk"

Expand All @@ -14,9 +14,8 @@ PKG_SUGGESTED_OPTIONS= x11 jasper
CONFIGURE_ARGS+= --without-x
.endif

.if !empty(PKG_OPTIONS:Mjasper)
BUILDLINK_API_DEPENDS.jasper+= jasper>=1.701.0
.include "../../graphics/jasper/buildlink3.mk"
.if !empty(PKG_OPTIONS:Mjp2)
.include "../../graphics/openjpeg/buildlink3.mk"
CONFIGURE_ARGS+= --with-jp2
.else
CONFIGURE_ARGS+= --without-jp2
Expand Down