summaryrefslogtreecommitdiff
path: root/graphics/hugin
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/hugin')
-rw-r--r--graphics/hugin/Makefile4
-rw-r--r--graphics/hugin/distinfo4
-rw-r--r--graphics/hugin/patches/patch-ab13
-rw-r--r--graphics/hugin/patches/patch-ad15
4 files changed, 33 insertions, 3 deletions
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 11ad1f16e02..f335a5547e7 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/05/15 07:26:22 adam Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:35 wiz Exp $
DISTNAME= hugin-2010.0.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hugin/}
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index 4b9f3a41b95..fe46a3dbca8 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2010/04/10 16:29:09 adam Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:44:35 wiz Exp $
SHA1 (hugin-2010.0.0.tar.gz) = 41eb7253aab12b913a5c9b6d9975d8652390dcb5
RMD160 (hugin-2010.0.0.tar.gz) = e2b03fe00a4a0242a1f3c4fd641cf8a3e312d516
Size (hugin-2010.0.0.tar.gz) = 12085453 bytes
SHA1 (patch-aa) = 87336d2059b3fe50346c9a806e28a1b881de011e
+SHA1 (patch-ab) = 3cf662d49f4cbfe742375d661653f25321d29aa1
SHA1 (patch-ac) = b091312601668e0504bca85da2ce808f7c447cd8
+SHA1 (patch-ad) = 64c30359067384fa058cb675dc1b08813bdc666c
diff --git a/graphics/hugin/patches/patch-ab b/graphics/hugin/patches/patch-ab
new file mode 100644
index 00000000000..259de989ffb
--- /dev/null
+++ b/graphics/hugin/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4 2010/06/13 22:44:35 wiz Exp $
+
+--- CMakeModules/FindPNG.cmake.orig 2010-03-02 23:17:21.000000000 +0000
++++ CMakeModules/FindPNG.cmake
+@@ -29,7 +29,7 @@ IF (ZLIB_FOUND)
+
+ find_library_with_debug(PNG_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+- NAMES png libpng wxpng
++ NAMES png14 libpng14 wxpng
+ PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+ )
+
diff --git a/graphics/hugin/patches/patch-ad b/graphics/hugin/patches/patch-ad
new file mode 100644
index 00000000000..034225aa88b
--- /dev/null
+++ b/graphics/hugin/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:35 wiz Exp $
+
+--- src/foreign/vigra/vigra_impex/png.cxx.orig 2010-03-02 23:17:21.000000000 +0000
++++ src/foreign/vigra/vigra_impex/png.cxx
+@@ -271,8 +271,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;
+ }
+