diff options
author | wiz <wiz@pkgsrc.org> | 2011-01-14 10:44:27 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2011-01-14 10:44:27 +0000 |
commit | d80890aebd7e879af325e274a2523617c679db80 (patch) | |
tree | 6c6364e9066d347585e2d678e229c0f82854524c /multimedia | |
parent | 9cecee25401e34c195275065e9fb6e2f25f48d6e (diff) | |
download | pkgsrc-d80890aebd7e879af325e274a2523617c679db80.tar.gz |
Fix build with png-1.5.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/mplayer-share/distinfo | 3 | ||||
-rw-r--r-- | multimedia/mplayer-share/patches/patch-ad | 33 |
2 files changed, 35 insertions, 1 deletions
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index ae4c8b15327..06cf3488143 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.69 2010/12/05 16:42:16 tsutsui Exp $ +$NetBSD: distinfo,v 1.70 2011/01/14 10:44:27 wiz Exp $ SHA1 (mplayer/mplayer-20100913.tar.bz2) = 6fd3acb29fa8455636bcd86f9f333da4763daa6d RMD160 (mplayer/mplayer-20100913.tar.bz2) = 79085d4ebdb824fc34f7bc128070ef11e874897d @@ -6,6 +6,7 @@ Size (mplayer/mplayer-20100913.tar.bz2) = 9073690 bytes SHA1 (patch-aa) = 9eae4563081e370d14560bb407a9b986b0128d7f SHA1 (patch-ab) = 1a927d956155a7b9a2daa1a4f522e47d830c5af6 SHA1 (patch-ac) = 3d037c96537233cdbda582afdb878dcf3f43e923 +SHA1 (patch-ad) = 84ce5a0f5cd8f59831c56b14dd2bc762793427ac SHA1 (patch-ae) = 7e1f05cd6e09f8755debfff7061dadf0a8ca3a3f SHA1 (patch-ag) = bef25568c913dcb8535afa51976ce7c94a6af5a2 SHA1 (patch-ah) = 8cbd14c61e74023055770baf27201687aa34fede diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad new file mode 100644 index 00000000000..e53e2d6dc19 --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-ad @@ -0,0 +1,33 @@ +$NetBSD: patch-ad,v 1.11 2011/01/14 10:44:27 wiz Exp $ + +Fix build with png-1.5. + +--- libmpcodecs/vd_mpng.c.orig 2010-02-26 15:01:37.000000000 +0000 ++++ libmpcodecs/vd_mpng.c +@@ -74,7 +74,7 @@ static int pngLength; + + static void pngReadFN( png_structp pngstr,png_bytep buffer,png_size_t size ) + { +- char * p = pngstr->io_ptr; ++ char * p = png_get_io_ptr(pngstr); + if(size>pngLength-pngPointer && pngLength>=pngPointer) size=pngLength-pngPointer; + fast_memcpy( buffer,(char *)&p[pngPointer],size ); + pngPointer+=size; +@@ -111,7 +111,7 @@ static mp_image_t* decode(sh_video_t *sh + png_get_IHDR( png,info,&png_width,&png_height,&depth,&color,NULL,NULL,NULL ); + png_set_bgr( png ); + +- switch( info->color_type ) { ++ switch( png_get_color_type( png,info ) ) { + case PNG_COLOR_TYPE_GRAY_ALPHA: + mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry gray scaled png with alpha channel not supported at moment.\n" ); + break; +@@ -128,7 +128,7 @@ static mp_image_t* decode(sh_video_t *sh + out_fmt=IMGFMT_BGR24; + break; + default: +- mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,info->color_type); ++ mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,png_get_color_type( png,info )); + } + + // (re)init libvo if image parameters changed (width/height/colorspace) |