Fri Jan 14 10:57:50 2011 UTC ()
Fix build with png-1.5.


(wiz)
diff -r1.9 -r1.10 pkgsrc/multimedia/dvdauthor/distinfo
diff -r0 -r1.3 pkgsrc/multimedia/dvdauthor/patches/patch-ab
cvs diff -r1.9 -r1.10 pkgsrc/multimedia/dvdauthor/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/dvdauthor/distinfo 2010/05/08 16:11:06 1.9
+++ pkgsrc/multimedia/dvdauthor/distinfo 2011/01/14 10:57:50 1.10
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.9 2010/05/08 16:11:06 drochner Exp $ 1$NetBSD: distinfo,v 1.10 2011/01/14 10:57:50 wiz Exp $
2 2
3SHA1 (dvdauthor-0.6.18.tar.gz) = 7b6e190a3903f617d08368e3cc5e6fd80677e2fb 3SHA1 (dvdauthor-0.6.18.tar.gz) = 7b6e190a3903f617d08368e3cc5e6fd80677e2fb
4RMD160 (dvdauthor-0.6.18.tar.gz) = d7571a8371305aefb283f433440b3be2264e9e34 4RMD160 (dvdauthor-0.6.18.tar.gz) = d7571a8371305aefb283f433440b3be2264e9e34
5Size (dvdauthor-0.6.18.tar.gz) = 392809 bytes 5Size (dvdauthor-0.6.18.tar.gz) = 392809 bytes
6SHA1 (patch-aa) = b8daa292a38786f7da2a6dcba9d03cd00260086c 6SHA1 (patch-aa) = b8daa292a38786f7da2a6dcba9d03cd00260086c
 7SHA1 (patch-ab) = 4f96e7ec097af871e190d61c9cfaab72ad74bc82
File Added: pkgsrc/multimedia/dvdauthor/patches/Attic/patch-ab
$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;