From 530706893f31269bbfa303e069f2e76cbbe2fce7 Mon Sep 17 00:00:00 2001
From: dinoex <dinoex@FreeBSD.org>
Date: Fri, 1 Jun 2012 05:26:28 +0000
Subject: - update png to 1.5.10

---
 games/r1q2/Makefile                       |  8 +++-----
 games/r1q2/files/patch-ref_gl__gl_image.c | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 games/r1q2/files/patch-ref_gl__gl_image.c

(limited to 'games/r1q2')

diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile
index 11be16a8ed7..22c310e989a 100644
--- a/games/r1q2/Makefile
+++ b/games/r1q2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	r1q2
 PORTVERSION=	7904
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.r1ch.net/stuff/r1q2/src/
 DISTNAME=	${PORTNAME}-b${PORTVERSION}-src
@@ -69,8 +69,9 @@ PLIST_SUB+=	GAME="@comment "
 USE_GL=		yes
 USE_SDL=	sdl
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png.6:${PORTSDIR}/graphics/png
+		png15:${PORTSDIR}/graphics/png
 ALL_TARGET+=	ref_gl
+CFLAGS+=	-I${LOCALBASE}/include/libpng15
 PLIST_SUB+=	REF_GL=""
 .else
 PLIST_SUB+=	REF_GL="@comment "
@@ -83,9 +84,6 @@ BROKEN=		Does not compile on sparc64
 post-patch:
 	@${REINPLACE_CMD} -e 's|game$$(ARCH)|game|g' \
 		${BUILD_WRKSRC}/game/Makefile
-# Resolve name collision with jpeg-8
-	${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
-		${WRKSRC}/ref_gl/gl_image.c
 
 pre-build:
 	@${FIND} ${BUILD_WRKSRC} -type d -depth 1 -exec ${MKDIR} {}/.depends \;
diff --git a/games/r1q2/files/patch-ref_gl__gl_image.c b/games/r1q2/files/patch-ref_gl__gl_image.c
new file mode 100644
index 00000000000..7ce3e30e389
--- /dev/null
+++ b/games/r1q2/files/patch-ref_gl__gl_image.c
@@ -0,0 +1,28 @@
+--- ref_gl/gl_image.c.orig	2012-04-29 06:56:19.000000000 +0200
++++ ref_gl/gl_image.c	2012-04-29 06:56:40.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include "gl_local.h"
+ #include <png.h>
++#include <pngpriv.h>
+ #include <jpeglib.h>
+ 
+ image_t		gltextures[MAX_GLTEXTURES];
+@@ -1520,7 +1521,7 @@
+     cinfo->src->bytes_in_buffer -= (size_t) num_bytes;
+ }
+ 
+-void jpeg_mem_src (j_decompress_ptr cinfo, byte *mem, int len)
++void local_jpeg_mem_src (j_decompress_ptr cinfo, byte *mem, int len)
+ {
+     cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small)((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr));
+     cinfo->src->init_source = jpg_null;
+@@ -1561,7 +1562,7 @@
+ 
+ 	cinfo.err = jpeg_std_error(&jerr);
+ 	jpeg_create_decompress(&cinfo);
+-	jpeg_mem_src(&cinfo, rawdata, rawsize);
++	local_jpeg_mem_src(&cinfo, rawdata, rawsize);
+ 	jpeg_read_header(&cinfo, true);
+ 	jpeg_start_decompress(&cinfo);
+ 
-- 
cgit