[gentoo-commits] gentoo-x86 commit in games-emulation/mupen64plus/files: mupen64plus-1.5-libpng14.patch mupen64plus-1.5-flags.patch mupen64plus-1.5-glide64-gcc44.patch mupen64plus-1.5-unbundle-bzip2.patch mupen64plus-1.5-plugindir.patch

[gentoo-commits] gentoo-x86 commit in games-emulation/mupen64plus/files: mupen64plus-1.5-libpng14.patch mupen64plus-1.5-flags.patch mupen64plus-1.5-glide64-gcc44.patch mupen64plus-1.5-unbundle-bzip2.patch mupen64plus-1.5-plugindir.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/03/11 15:30:47

  Added:                mupen64plus-1.5-libpng14.patch
  Removed:              mupen64plus-1.5-flags.patch
                        mupen64plus-1.5-glide64-gcc44.patch
                        mupen64plus-1.5-unbundle-bzip2.patch
                        mupen64plus-1.5-plugindir.patch
  Log:
  Fix building with libpng14 wrt #308753 by Locke Shinseiko. Clean up unused patches from files directory.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch?rev=1.1&content-type=text/plain

Index: mupen64plus-1.5-libpng14.patch
===================================================================
http://bugs.gentoo.org/show_bug.cgi?id=308753

--- rice_video/liblinux/pngrw.c
+++ rice_video/liblinux/pngrw.c
@@ -136,9 +136,9 @@
         if (end_info != NULL)
             png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, (png_infop *) &end_info);
         else if (info_ptr != NULL)
-            png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, png_infopp_NULL);
+            png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, NULL);
         else if (png_ptr != NULL)
-            png_destroy_read_struct((png_structp *) &png_ptr, png_infopp_NULL, png_infopp_NULL);
+            png_destroy_read_struct((png_structp *) &png_ptr, NULL, NULL);
         if (rows)
         {
             if (rows[0])
@@ -162,7 +162,7 @@
 
     /* check the signature */
     fread( signature, 1, 8, file );
-    if ( !png_check_sig( signature, 8 ) )
+    if ( png_sig_cmp( signature, 0, 8 ) )
         longjmp( err_jmp, (int)errUnsupportedFileFormat );
 
     /* create a pointer to the png read structure */
@@ -199,7 +199,7 @@
 
     /* extract the data we need to form the HBITMAP from the PNG header */
     png_get_IHDR( png_ptr, info_ptr, &Width, &Height, &BitDepth, &ColorType,
-        &InterlaceType, int_p_NULL, int_p_NULL);
+        &InterlaceType, (int *) NULL, (int *) NULL);
 
     img->width = Width;
     img->height = Height;