aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorGreg Larkin <glarkin@FreeBSD.org>2012-06-12 15:21:52 +0000
committerGreg Larkin <glarkin@FreeBSD.org>2012-06-12 15:21:52 +0000
commit5d147c9ea8a9b841b86e8194129f148b93a06839 (patch)
tree1617a59df99d67f34665c1bb4fdf03555a6585d0 /graphics
parentbc53b57d23ca3d4f774cc3cfa85c08c64711488f (diff)
Notes
Diffstat (limited to 'graphics')
-rw-r--r--graphics/GraphicsMagick13/Makefile2
-rw-r--r--graphics/GraphicsMagick13/files/patch-coders__png.c40
2 files changed, 41 insertions, 1 deletions
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index bee8a2196025..c2086602c49d 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GraphicsMagick
PORTVERSION= 1.3.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
diff --git a/graphics/GraphicsMagick13/files/patch-coders__png.c b/graphics/GraphicsMagick13/files/patch-coders__png.c
new file mode 100644
index 000000000000..8be45f57aa9d
--- /dev/null
+++ b/graphics/GraphicsMagick13/files/patch-coders__png.c
@@ -0,0 +1,40 @@
+--- ./coders/png.c.orig 2012-04-28 15:45:16.000000000 -0400
++++ ./coders/png.c 2012-06-12 10:41:35.000000000 -0400
+@@ -1601,6 +1601,12 @@
+ 115, 67, 65, 76, '\0', /* sCAL */
+ 115, 80, 76, 84, '\0', /* sPLT */
+ 116, 73, 77, 69, '\0', /* tIME */
++#ifdef PNG_APNG_SUPPORTED /* libpng was built with APNG patch; */
++ /* ignore the APNG chunks */
++ 97, 99, 84, 76, '\0', /* acTL */
++ 102, 99, 84, 76, '\0', /* fcTL */
++ 102, 100, 65, 84, '\0', /* fdAT */
++#endif
+ };
+ #endif
+
+@@ -1707,6 +1713,11 @@
+ (int)sizeof(unused_chunks)/5);
+ #endif
+
++#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
++ /* Disable new libpng-1.5.10 feature */
++ png_set_check_for_invalid_index (ping, 0);
++#endif
++
+ #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
+ && (PNG_LIBPNG_VER >= 10200)
+ /* Disable thread-unsafe features of pnggccrd */
+@@ -6356,6 +6367,12 @@
+ /*
+ Prepare PNG for writing.
+ */
++
++#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
++ /* Disable new libpng-1.5.10 feature */
++ png_set_check_for_invalid_index (ping, 0);
++#endif
++
+ #if defined(PNG_MNG_FEATURES_SUPPORTED)
+ if (mng_info->write_mng)
+ (void) png_permit_mng_features(ping,PNG_ALL_MNG_FEATURES);