svn commit: r375374 - in head/emulators/zsnes: . files

[Baptiste Daroussin]

Author: bapt
Date: Tue Dec 23 23:39:53 2014
New Revision: 375374
URL: https://svnweb.freebsd.org/changeset/ports/375374
QAT: https://qat.redports.org/buildarchive/r375374/

Log:
  Properly patch for png 1.5

Added:
  head/emulators/zsnes/files/patch-zip_zpng.c   (contents, props changed)
Deleted:
  head/emulators/zsnes/files/patch-zpng.c
Modified:
  head/emulators/zsnes/Makefile

Modified: head/emulators/zsnes/Makefile
==============================================================================
--- head/emulators/zsnes/Makefile	Tue Dec 23 23:36:48 2014	(r375373)
+++ head/emulators/zsnes/Makefile	Tue Dec 23 23:39:53 2014	(r375374)
@@ -3,7 +3,7 @@
 
 PORTNAME=	zsnes
 PORTVERSION=	1.51
-PORTREVISION=	10
+PORTREVISION=	11
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/ZSNES%20v${PORTVERSION}
@@ -14,7 +14,7 @@ COMMENT=	Intel x86 only Super Nintendo E
 
 # This must be >= 0.98!
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	non-portable, for a portable emulator see emulators/snes9x
@@ -42,8 +42,8 @@ OPENGL_CONFIGURE_ENABLE=	opengl
 AO_LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
 AO_CONFIGURE_ENABLE=	libao
 
-CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>

Added: head/emulators/zsnes/files/patch-zip_zpng.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/zsnes/files/patch-zip_zpng.c	Tue Dec 23 23:39:53 2014	(r375374)
@@ -0,0 +1,10 @@
+--- zip/zpng.c.orig	2007-01-15 23:06:29 UTC
++++ zip/zpng.c
+@@ -129,7 +129,6 @@ int Png_Dump(const char *filename, unsig
+         png_set_IHDR(png_ptr, info_ptr, width, height, 8,
+                      PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
+                      PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+-        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+ 
+         //Allocate an array of scanline pointers
+         row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));