Fix build with png-1.5.

4 files changed, 38 insertions, 11 deletions

diff --git a/multimedia/dvdauthor/distinfo b/multimedia/dvdauthor/distinfo
index c135958e2df..b869570f64b 100644
--- a/multimedia/dvdauthor/distinfo
+++ b/multimedia/dvdauthor/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2010/05/08 16:11:06 drochner Exp $
+$NetBSD: distinfo,v 1.10 2011/01/14 10:57:50 wiz Exp $
 
 SHA1 (dvdauthor-0.6.18.tar.gz) = 7b6e190a3903f617d08368e3cc5e6fd80677e2fb
 RMD160 (dvdauthor-0.6.18.tar.gz) = d7571a8371305aefb283f433440b3be2264e9e34
 Size (dvdauthor-0.6.18.tar.gz) = 392809 bytes
 SHA1 (patch-aa) = b8daa292a38786f7da2a6dcba9d03cd00260086c
+SHA1 (patch-ab) = 4f96e7ec097af871e190d61c9cfaab72ad74bc82
diff --git a/multimedia/dvdauthor/patches/patch-ab b/multimedia/dvdauthor/patches/patch-ab
new file mode 100644
index 00000000000..d0a14bd4a3d
--- /dev/null
+++ b/multimedia/dvdauthor/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.3 2011/01/14 10:57:50 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/spuunmux.c.orig	2010-03-05 06:37:06.000000000 +0000
++++ src/spuunmux.c
+@@ -38,6 +38,7 @@
+ #include <netinet/in.h>
+ 
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "rgb.h"
+ #include "common.h"
+@@ -483,7 +484,7 @@ static int write_png(char *file_name,str
+     return -1;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+     png_destroy_write_struct(&png_ptr, &info_ptr);
+     fclose(fp);
+     return -1;
diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo
index 047152d641a..d64d5b5bbdd 100644
--- a/multimedia/fxtv/distinfo
+++ b/multimedia/fxtv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2009/10/31 19:40:33 tnn Exp $
+$NetBSD: distinfo,v 1.14 2011/01/14 10:55:42 wiz Exp $
 
 SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
 RMD160 (fxtv-1.03.tgz) = 740ddbb4e3b58028a6b8f17483bc27b82420f280
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 5073dd51a7c2a35344f71e53456a311c79818dbb
 SHA1 (patch-ab) = 80523d5cb2fcc06c2486f3be2556f5f9b1362472
 SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
 SHA1 (patch-ad) = daea79659e2b7af142ca101601887d58239f35d7
-SHA1 (patch-ae) = aa7689ff62388d4d50f89501f2c3084bc04409d8
+SHA1 (patch-ae) = 356ca0b0973dcc18e066e485a0330b3d3b7d6dc6
 SHA1 (patch-af) = 48a07b3407f40be23594b4957bb8a590cd9ef585
 SHA1 (patch-ag) = 13655a94cd6200d12e25d406d7c1923f89000c80
 SHA1 (patch-ah) = 896d5164b176154b398f52d5c9887210da3d1e77
diff --git a/multimedia/fxtv/patches/patch-ae b/multimedia/fxtv/patches/patch-ae
index 3857ce8c817..469023416a4 100644
--- a/multimedia/fxtv/patches/patch-ae
+++ b/multimedia/fxtv/patches/patch-ae
@@ -1,16 +1,19 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
+$NetBSD: patch-ae,v 1.2 2011/01/14 10:55:42 wiz Exp $
 
---- imgsav.c.orig	Sun Sep 26 16:35:06 1999
+Support png screenshots.
+
+--- imgsav.c.orig	1999-09-26 14:35:06.000000000 +0000
 +++ imgsav.c
-@@ -29,6 +29,7 @@
+@@ -29,6 +29,8 @@
  
  /*      ******************** Include Files                ************** */
  
 +#include <png.h>
++#include <zlib.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
-@@ -254,6 +255,96 @@ void TVIMGSAVDoSaveTIFF( char filename[]
+@@ -254,6 +256,96 @@ void TVIMGSAVDoSaveTIFF( char filename[]
  }
  
  
@@ -107,13 +110,13 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
  void TVIMGSAVDoSavePPM( char filename[], TV_IMAGE *img )
  {
      static char     *S_fp_buf   = NULL;
-@@ -407,6 +498,9 @@ void TVIMGSAVDoSave( char filename[], TV
-                 exit(1);
+@@ -408,6 +500,9 @@ void TVIMGSAVDoSave( char filename[], TV
              }
              TVIMGSAVDoSaveTIFF( filename, img );  break;
-+
+ 
 +        case TV_STILL_FMT_PNG :
 +            TVIMGSAVDoSavePNG ( filename, img );  break;
- 
++
          case TV_STILL_FMT_PPM :
              TVIMGSAVDoSavePPM ( filename, img );  break;
+