Revision: 87380 http://trac.macports.org/changeset/87380 Author: ryandesign@macports.org Date: 2011-11-18 20:07:56 -0800 (Fri, 18 Nov 2011) Log Message: ----------- VLC09: fix incompatibility with libpng 1.4.x; see #32118 Modified Paths: -------------- trunk/dports/multimedia/VLC09/Portfile Added Paths: ----------- trunk/dports/multimedia/VLC09/files/patch-modules-codec-png.c.diff Modified: trunk/dports/multimedia/VLC09/Portfile =================================================================== --- trunk/dports/multimedia/VLC09/Portfile 2011-11-19 03:38:04 UTC (rev 87379) +++ trunk/dports/multimedia/VLC09/Portfile 2011-11-19 04:07:56 UTC (rev 87380) @@ -36,7 +36,8 @@ port:libdvdplay port:libdvdnav path:lib/libavcodec.dylib:ffmpeg \ port:gnutls port:taglib port:libxml2 port:faad2 -patchfiles patch-Makefile.am.diff +patchfiles patch-Makefile.am.diff \ + patch-modules-codec-png.c.diff use_autoreconf yes autoreconf.args -fvi Added: trunk/dports/multimedia/VLC09/files/patch-modules-codec-png.c.diff =================================================================== --- trunk/dports/multimedia/VLC09/files/patch-modules-codec-png.c.diff (rev 0) +++ trunk/dports/multimedia/VLC09/files/patch-modules-codec-png.c.diff 2011-11-19 04:07:56 UTC (rev 87380) @@ -0,0 +1,31 @@ +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Mon, 15 Feb 2010 22:50:27 +0000 (+0100) +Subject: Png: compatibility with libpng 1.4 +X-Git-Tag: 1.1.0-pre1~906 +X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=ffa6a2fa83452afe6a6e... + +Png: compatibility with libpng 1.4 + +Patch probably from arekm -- pld-linux . org +--- + +--- modules/codec/png.c.orig ++++ modules/codec/png.c +@@ -152,7 +152,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) + p_info = png_create_info_struct( p_png ); + if( p_info == NULL ) + { +- png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL ); ++ png_destroy_read_struct( &p_png, NULL, NULL ); + block_Release( p_block ); *pp_block = NULL; + return NULL; + } +@@ -160,7 +160,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) + p_end_info = png_create_info_struct( p_png ); + if( p_end_info == NULL ) + { +- png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL ); ++ png_destroy_read_struct( &p_png, &p_info, NULL ); + block_Release( p_block ); *pp_block = NULL; + return NULL; + }