summaryrefslogtreecommitdiff
path: root/graphics/povray
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2010-06-18 06:55:43 +0000
committerwiz <wiz@pkgsrc.org>2010-06-18 06:55:43 +0000
commitf34da7d785d486e270b51c96c75495da1061fd9c (patch)
tree956734e2e15ac97694d58c055e62e9b374c822da /graphics/povray
parent41bd0a14cf25653617bf8ceaf1a2d84ee1c75627 (diff)
downloadpkgsrc-f34da7d785d486e270b51c96c75495da1061fd9c.tar.gz
Fix build with png-1.4.x. Addresses PR 43486.
Diffstat (limited to 'graphics/povray')
-rw-r--r--graphics/povray/distinfo4
-rw-r--r--graphics/povray/patches/patch-af20
2 files changed, 21 insertions, 3 deletions
diff --git a/graphics/povray/distinfo b/graphics/povray/distinfo
index 76be0642a24..db9a163a308 100644
--- a/graphics/povray/distinfo
+++ b/graphics/povray/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2006/10/19 23:46:01 rillig Exp $
+$NetBSD: distinfo,v 1.15 2010/06/18 06:55:43 wiz Exp $
SHA1 (povray-3.6.1.tar.bz2) = 1fab3ccbdedafbf77e3a66087709bbdf60bc643d
RMD160 (povray-3.6.1.tar.bz2) = 84ba679da66089f192cc1bfcf8bdd498e736a9a3
Size (povray-3.6.1.tar.bz2) = 8200160 bytes
SHA1 (patch-aa) = 351e2eb509cdb3e95c788de5f9ff41c993d4363d
SHA1 (patch-ad) = fa4056ca956cb2872960fcb649e259aad1f065e4
-SHA1 (patch-af) = b941ffe6f1f54b5bc6139ec2b7fba480f6393bf1
+SHA1 (patch-af) = 92cdaf9261c0196b1404ba3dff32131cf250dee1
SHA1 (patch-ag) = 67ad332366614e60b0842572d7d07debe8b6e8f2
SHA1 (patch-ah) = b8184166d1641d5147f2d532a3e5433f2a686ede
SHA1 (patch-ai) = 4d6d1f7fa38f5d2bf5511f54b1743f734753672d
diff --git a/graphics/povray/patches/patch-af b/graphics/povray/patches/patch-af
index 60f38621a15..53cae66f05e 100644
--- a/graphics/povray/patches/patch-af
+++ b/graphics/povray/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2006/05/06 11:59:49 wiz Exp $
+$NetBSD: patch-af,v 1.2 2010/06/18 06:55:44 wiz Exp $
--- source/png_pov.cpp.orig 2004-08-02 23:11:37.000000000 +0000
+++ source/png_pov.cpp
@@ -20,3 +20,21 @@ $NetBSD: patch-af,v 1.1 2006/05/06 11:59:49 wiz Exp $
}
#ifdef POV_COMMENTS // temporarily skip comment writing code
+@@ -1428,7 +1424,7 @@ void Read_Png_Image(IMAGE *Image, char *
+ if(r_info_ptr->valid & PNG_INFO_tRNS)
+ {
+ for (index = 0; index < r_info_ptr->num_trans; index++)
+- cmap[index].Transmit = 255 - r_info_ptr->trans[index];
++ cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
+ }
+
+ Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
+@@ -1461,7 +1457,7 @@ void Read_Png_Image(IMAGE *Image, char *
+ if(r_info_ptr->valid & PNG_INFO_tRNS)
+ {
+ for (index = 0; index < r_info_ptr->num_trans; index++)
+- cmap[index].Transmit = 255 - r_info_ptr->trans[index];
++ cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
+ }
+
+ Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");