summaryrefslogtreecommitdiff
path: root/graphics/vigra
diff options
context:
space:
mode:
authorwiz <wiz>2010-06-13 22:43:46 +0000
committerwiz <wiz>2010-06-13 22:43:46 +0000
commit6af156235b3b94e0c3542e1b617f2653855e0c4f (patch)
tree4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /graphics/vigra
parent354cf6a07fa5783bda1f7548ccc97a684c6a7f8e (diff)
downloadpkgsrc-6af156235b3b94e0c3542e1b617f2653855e0c4f.tar.gz
Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other problems when looking for or compiling against libpng-1.4.x.
Diffstat (limited to 'graphics/vigra')
-rw-r--r--graphics/vigra/Makefile4
-rw-r--r--graphics/vigra/distinfo3
-rw-r--r--graphics/vigra/patches/patch-ab15
3 files changed, 19 insertions, 3 deletions
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index db10757401b..8884039bd79 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:46 wiz Exp $
#
DISTNAME= vigra1.6.0
PKGNAME= ${DISTNAME:C/^[[:alpha:]]+/&-/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/
diff --git a/graphics/vigra/distinfo b/graphics/vigra/distinfo
index 60cfabd1d3d..a5edee37a94 100644
--- a/graphics/vigra/distinfo
+++ b/graphics/vigra/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/08/25 18:17:56 bjs Exp $
+$NetBSD: distinfo,v 1.2 2010/06/13 22:44:46 wiz Exp $
SHA1 (vigra1.6.0.tar.gz) = 9714a0c4efb77726a1140329e98e5db057f9a69f
RMD160 (vigra1.6.0.tar.gz) = cc9f6626801182a0ee71ec9eb8fa34c38f8777a7
Size (vigra1.6.0.tar.gz) = 16525605 bytes
SHA1 (patch-aa) = 612e0284ba4ff531ad376586a125a4139d1bdbff
+SHA1 (patch-ab) = 3b8f1d37db04377ab76287a01a3e1d436f60b04e
diff --git a/graphics/vigra/patches/patch-ab b/graphics/vigra/patches/patch-ab
new file mode 100644
index 00000000000..2443fc6bf56
--- /dev/null
+++ b/graphics/vigra/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2010/06/13 22:44:46 wiz Exp $
+
+--- src/impex/png.cxx.orig 2008-08-13 13:15:45.000000000 +0000
++++ src/impex/png.cxx
+@@ -270,8 +270,8 @@ namespace vigra {
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+ if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+- png_set_gray_1_2_4_to_8(png);
++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++ png_set_expand_gray_1_2_4_to_8(png);
+ bit_depth = 8;
+ }
+