[mupen64plus] 167/262: Update fix_readpng.patch, Fix FTBFS with libpng14

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 202d1d376c0c18d9e5d8dcb33289edf8337295a8
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Mar 10 00:59:14 2010 +0100

    Update fix_readpng.patch, Fix FTBFS with libpng14
---
 debian/changelog                 | 1 +
 debian/patches/fix_readpng.patch | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2da52c..048ed8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mupen64plus (1.5+dfsg1-8) UNRELEASED; urgency=low
 
   * debian/patches:
     - Add rice_fog.patch, Reduce flickering when enabling fog in rice
+    - Update fix_readpng.patch, Fix FTBFS with libpng14
   * Convert to 3.0 (quilt) source format
   * debian/control:
     - Remove shlibs:Depends for binary packages without shared libs dependencies
diff --git a/debian/patches/fix_readpng.patch b/debian/patches/fix_readpng.patch
index a90c36c..650996f 100644
--- a/debian/patches/fix_readpng.patch
+++ b/debian/patches/fix_readpng.patch
@@ -64,7 +64,7 @@ index 13c66fdc427c6fc94bff5e3434a1067199d7353f..e1e821db0ec45854faff4c0710195b75
  
      if ( img.bits == NULL )
 diff --git a/rice_video/liblinux/pngrw.c b/rice_video/liblinux/pngrw.c
-index 673741adbc1d75499100624572a6512fdefd39dc..c564727dbe56dbce59aa69212d46913f89a45e8a 100644
+index 673741adbc1d75499100624572a6512fdefd39dc..c13e5d4f410163635d307503acbc13ff6899c2a0 100644
 --- a/rice_video/liblinux/pngrw.c
 +++ b/rice_video/liblinux/pngrw.c
 @@ -94,12 +94,12 @@ Comments:
@@ -119,9 +119,9 @@ index 673741adbc1d75499100624572a6512fdefd39dc..c564727dbe56dbce59aa69212d46913f
 +        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] )
@@ -178,7 +178,7 @@ index 673741adbc1d75499100624572a6512fdefd39dc..c564727dbe56dbce59aa69212d46913f
      /* 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, NULL, NULL );
-+        &InterlaceType, int_p_NULL, int_p_NULL);
++        &InterlaceType, NULL, NULL);
  
      img->width = Width;
      img->height = Height;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git