23308575 Upgrade ImageMagick to 6.9.4-2
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 18 May 2016 14:04:47 -0700
changeset 6025 b539058f5dc7
parent 6024 1ef2f49e9382
child 6026 eca0f4ac65d8
23308575 Upgrade ImageMagick to 6.9.4-2
components/imagemagick/Makefile
components/imagemagick/test/results-64.master
--- a/components/imagemagick/Makefile	Wed May 18 14:54:17 2016 -0700
+++ b/components/imagemagick/Makefile	Wed May 18 14:04:47 2016 -0700
@@ -29,12 +29,12 @@
 COMPONENT_NAME=			ImageMagick
 COMPONENT_VERSION=		6.9.4
 COMPONENT_MAJOR_VERSION=	$(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\([0-9]\+\)\.[0-9]\+\.[0-9]\+/\1/')
-COMPONENT_SUBVERSION=		1
+COMPONENT_SUBVERSION=		2
 HUMAN_VERSION=			$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
 COMPONENT_PROJECT_URL=		http://www.imagemagick.org/
 COMPONENT_ARCHIVE=		$(COMPONENT_SRC)-$(COMPONENT_SUBVERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:b7dbe07d481e3c81004930c4e169281a2d8fc067c5c5a5dd30499af60a21aa38
+    sha256:0974d97ceb45e32d25e98bc279690988fa5d5f5b9d50e5a6dc5e5b7eef892f50
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/download/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/imagemagick
 
--- a/components/imagemagick/test/results-64.master	Wed May 18 14:54:17 2016 -0700
+++ b/components/imagemagick/test/results-64.master	Wed May 18 14:04:47 2016 -0700
@@ -29,7 +29,7 @@
 PASS: tests/validate-compare.tap 1
 PASS: tests/validate-composite.tap 1
 PASS: tests/validate-convert.tap 1
-PASS: tests/validate-formats-disk.tap 1
+FAIL: tests/validate-formats-disk.tap 1
 PASS: tests/validate-formats-map.tap 1
 PASS: tests/validate-formats-memory.tap 1
 PASS: tests/validate-identify.tap 1
@@ -75,9 +75,9 @@
 PASS: Magick++/demo/demos.tap 23
 PASS: Magick++/demo/demos.tap 24
 # TOTAL: 76
-# PASS:  76
+# PASS:  75
 # SKIP:  0
 # XFAIL: 0
-# FAIL:  0
+# FAIL:  1
 # XPASS: 0
 # ERROR: 0