[gentoo-commits] gentoo-x86 commit in media-libs/ming/files: ming-0.4.3-libpng-1.5.patch

[Mike Frysinger (vapier)]

vapier      11/02/21 17:30:11

  Added:                ming-0.4.3-libpng-1.5.patch
  Log:
  Add patch from upstream for building with libpng-1.5.  Use emake everywhere.  Build in parallel as it seems to work for me.
  
  (Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-libs/ming/files/ming-0.4.3-libpng-1.5.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ming/files/ming-0.4.3-libpng-1.5.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ming/files/ming-0.4.3-libpng-1.5.patch?rev=1.1&content-type=text/plain

Index: ming-0.4.3-libpng-1.5.patch
===================================================================
From 63a408b763e3facdc8965ef216a06621f04e16ed Mon Sep 17 00:00:00 2001
From: OBATA Akio <obata@××××.jp>
Date: Tue, 15 Feb 2011 09:54:34 +0100
Subject: [PATCH] Bug 109 - libpng-1.5 support

---
 src/blocks/pngdbl.c |    4 ++--
 util/png2dbl.c      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/blocks/pngdbl.c b/src/blocks/pngdbl.c
index e0b88d6..77bb323 100644
--- a/src/blocks/pngdbl.c
+++ b/src/blocks/pngdbl.c
@@ -61,7 +61,7 @@ static png_structp openPngFromFile(FILE *fp)
 }
 
 static int pngReadFunc(png_structp png, unsigned char *buf, int len)
-{	SWFInput input = (SWFInput) png->io_ptr;
+{	SWFInput input = (SWFInput) png_get_io_ptr(png);
 	return SWFInput_read(input, buf, len);
 }
 
@@ -127,7 +127,7 @@ static int readPNG(png_structp png_ptr, dblData result)
 		return 0;
 	}
 
-	if(setjmp(png_ptr->jmpbuf))
+	if(setjmp(png_jmpbuf(png_ptr)))
 	{
 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
     	return 0;
diff --git a/util/png2dbl.c b/util/png2dbl.c
index 49610a3..ce44b27 100644
--- a/util/png2dbl.c
+++ b/util/png2dbl.c
@@ -91,7 +91,7 @@ struct pngdata readPNG(FILE *fp)
     error("Couldn't create end_info\n");
   }
 
-  if(setjmp(png_ptr->jmpbuf))
+  if(setjmp(png_jmpbuf(png_ptr)))
   {
     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
     fclose(fp);
-- 
1.7.4.1