Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/dvdauthor/files: dvdauthor-0.6.14-libpng-1.5.patch
Date: Mon, 21 Feb 2011 17:43:50
Message-Id: 20110221174340.E9DCE20057@flycatcher.gentoo.org
1 vapier 11/02/21 17:43:40
2
3 Added: dvdauthor-0.6.14-libpng-1.5.patch
4 Log:
5 Fix for building with libpng-1.5 #355039 by Lars Wendler.
6
7 (Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-video/dvdauthor/files/dvdauthor-0.6.14-libpng-1.5.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/dvdauthor/files/dvdauthor-0.6.14-libpng-1.5.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/dvdauthor/files/dvdauthor-0.6.14-libpng-1.5.patch?rev=1.1&content-type=text/plain
14
15 Index: dvdauthor-0.6.14-libpng-1.5.patch
16 ===================================================================
17 http://bugs.gentoo.org/355039
18
19 $NetBSD: patch-ab,v 1.3 2011/01/14 10:57:50 wiz Exp $
20
21 Fix build with png-1.5.
22
23 --- src/spuunmux.c
24 +++ src/spuunmux.c
25 @@ -38,6 +38,7 @@
26 #include <netinet/in.h>
27
28 #include <png.h>
29 +#include <zlib.h>
30
31 #include "rgb.h"
32
33 @@ -483,7 +484,7 @@ static int write_png(char *file_name,str
34 return -1;
35 }
36
37 - if (setjmp(png_ptr->jmpbuf)) {
38 + if (setjmp(png_jmpbuf(png_ptr))) {
39 png_destroy_write_struct(&png_ptr, &info_ptr);
40 fclose(fp);
41 return -1;