Attachment #132265 for bug #176534




# Created by: Travis Poppe <tlp@liquidx.org>
# Date created:			30 Jun 2004
# Whom:				Travis Poppe <tlp@liquidx.org>
#
# $FreeBSD: head/games/stratagus/Makefile 301513 2012-07-25 08:13:30Z gerald $
#

PORTNAME=	stratagus
PORTVERSION=	2.2.7
PORTREVISION=	3
CATEGORIES=	games
MASTER_SITES=	http://launchpadlibrarian.net/113005346/
DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
EXTRACT_SUFX=	.orig.tar.gz

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Free cross-platform real-time strategy gaming engine

LICENSE=	GPLv2

LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png

OPTIONS_DEFINE=	MIKMOD MNG THEORA VORBIS DOCS
OPTIONS_DEFAULT=	VORBIS
MNG_DESC=	Enable MNG support

USE_GL=		glu
USE_GCC=	4.6+
USE_LUA=	5.0+
USE_SDL=	sdl
USE_LUA=	5.0+
LUA_COMPS=	toluaxx
USE_CMAKE=	yes
CMAKE_OUTSOURCE=	yes
CMAKE_ARGS=	-DGAMEDIR:STRING="bin" \
		-DTOLUA++_APP:STRING="${TOLUAXX_CMD}" \
		-DTOLUA++_INCLUDE_DIR:STRING="${LUA_INCDIR}" \
		-DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so"
MAKE_JOBS_SAFE=	yes
MAKE_JOBS_UNSAFE=	yes

MAN6=		stratagus.6
PORTDOCS=	*
PLIST_FILES=	bin/png2stratagus bin/stratagus sbin/metaserver

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MMIKMOD}
LIB_DEPENDS+=	mikmod:${PORTSDIR}/audio/libmikmod
CMAKE_ARGS+=	-DWITH_MIKMOD:BOOL=ON
.else
CMAKE_ARGS+=	-DWITH_MIKMOD:BOOL=OFF
.endif

.if ${PORT_OPTIONS:MMNG}
LIB_DEPENDS+=	mng:${PORTSDIR}/graphics/libmng
CMAKE_ARGS+=	-DWITH_MNG:BOOL=ON
.else
CMAKE_ARGS+=	-DWITH_MNG:BOOL=OFF
.endif

.if ${PORT_OPTIONS:MTHEORA}
LIB_DEPENDS+=	theora:${PORTSDIR}/multimedia/libtheora
CMAKE_ARGS+=	-DWITH_THEORA:BOOL=ON
.else
CMAKE_ARGS+=	-DWITH_THEORA:BOOL=OFF
.endif

.if ${PORT_OPTIONS:MVORBIS}
LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
CMAKE_ARGS+=	-DWITH_OGGVORBIS:BOOL=ON
.else
CMAKE_ARGS+=	-DWITH_OGGVORBIS:BOOL=OFF
.endif

post-install:
	(cd ${WRKSRC}/doc && ${INSTALL_DATA} stratagus.6 ${MAN6PREFIX}/man/man6)

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/stratagus ${PREFIX}/bin
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
	(cd ${WRKSRC}/doc && ${INSTALL_DATA} [a-z]*.html *.txt ${DOCSDIR})
	@${MKDIR} ${DOCSDIR}/graphics
	(cd ${WRKSRC}/doc/graphics && ${INSTALL_DATA} * ${DOCSDIR}/graphics)
	@${MKDIR} ${DOCSDIR}/scripts
	(cd ${WRKSRC}/doc/scripts && ${INSTALL_DATA} * ${DOCSDIR}/scripts)
	@${ECHO_CMD}
	@${CAT} ${PKGMESSAGE}
	@${ECHO_CMD}
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)games/stratagus/distinfo (-2 / +2 lines)
1	SHA256 (stratagus_2.2.5.5.orig.tar.gz) = e0c8fe592ee3ad0c5806937aa950aad39019780de5344987366fe76901377285	1	SHA256 (stratagus_2.2.7.orig.tar.gz) = 9bdaf207623b60a5e98451128bb7fb649e00ce4aba507320bde63e60f93e8c9f
2	SIZE (stratagus_2.2.5.5.orig.tar.gz) = 976972	2	SIZE (stratagus_2.2.7.orig.tar.gz) = 939967




--- src/video/png.cpp.orig	2010-11-20 12:23:28.000000000 +0100
+++ src/video/png.cpp	2012-04-29 07:12:14.000000000 +0200
@@ -39,6 +39,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <png.h>
+#include <pngpriv.h>
 
 #include "stratagus.h"
 #include "video.h"
@@ -147,7 +148,7 @@
 	 * the normal method of doing things with libpng).  REQUIRED unless you
 	 * set up your own error handlers in png_create_read_struct() earlier.
 	 */
-	if (setjmp(png_ptr->jmpbuf)) {
+	if (setjmp(png_jmpbuf(png_ptr))) {
 		fprintf(stderr, "Error reading the PNG file.\n");
 		ret = -1;
 		goto done;
@@ -343,7 +344,7 @@
 		return;
 	}
 
-	if (setjmp(png_ptr->jmpbuf)) {
+	if (setjmp(png_jmpbuf(png_ptr))) {
 		/* If we get here, we had a problem reading the file */
 		fclose(fp);
 		png_destroy_write_struct(&png_ptr, &info_ptr);

Lines 4-7 Link Here

(-)games/stratagus/pkg-descr (-1 / +1 lines)
4	a wide-range of features specific to your needs. See the data sets page	4	a wide-range of features specific to your needs. See the data sets page
5	for a list of current games using the stratagus engine.	5	for a list of current games using the stratagus engine.
6		6
7	WWW: http://stratagus.sourceforge.net	7	WWW: https://launchpad.net/stratagus

Return to bug 176534

Lines 1-86 Link Here

(-)games/stratagus/Makefile (-44 / +38 lines)
1	# New ports collection makefile for: stratagus	1	# Created by: Travis Poppe <tlp@liquidx.org>
2	# Date created: 30 Jun 2004
3	# Whom: Travis Poppe <tlp@liquidx.org>
4	#
5	# $FreeBSD: head/games/stratagus/Makefile 301513 2012-07-25 08:13:30Z gerald $	2	# $FreeBSD: head/games/stratagus/Makefile 301513 2012-07-25 08:13:30Z gerald $
6	#
7		3
8	PORTNAME= stratagus	4	PORTNAME= stratagus
9	PORTVERSION= 2.2.5.5	5	PORTVERSION= 2.2.7
10	PORTREVISION= 3
11	CATEGORIES= games	6	CATEGORIES= games
12	MASTER_SITES= http://launchpadlibrarian.net/59493540/	7	MASTER_SITES= http://launchpadlibrarian.net/113005346/
13	DISTNAME= ${PORTNAME}_${PORTVERSION}	8	DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
14	EXTRACT_SUFX= .orig.tar.gz
15		9
16	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
17	COMMENT= Free cross-platform real-time strategy gaming engine	11	COMMENT= Free cross-platform real-time strategy gaming engine
18		12
		13	LICENSE= GPLv2
		14
19	LIB_DEPENDS= png15:${PORTSDIR}/graphics/png	15	LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
20		16
21	OPTIONS_DEFINE= MIKMOD MNG THEORA VORBIS DOCS	17	OPTIONS_DEFINE= MIKMOD MNG THEORA VORBIS DOCS
22	OPTIONS_DEFAULT= VORBIS	18	OPTIONS_DEFAULT= VORBIS
23	MNG_DESC= Enable MNG support
24		19
25	LICENSE= GPLv2	20	USE_GL= glu
26	USE_GCC= 4.6+
27	USE_LUA= 5.0+
28	USE_SDL= sdl	21	USE_SDL= sdl
29	USE_GL= gl	22	USE_LUA= 5.0+
30	USE_AUTOTOOLS= aclocal autoheader autoconf	23	LUA_COMPS= toluaxx
31	USE_GMAKE= yes	24	USE_CMAKE= yes
32	GNU_CONFIGURE= yes	25	CMAKE_OUTSOURCE= yes
33	CONFIGURE_ARGS= --with-extra-includes=${LUA_INCDIR} \	26	CMAKE_ARGS= -DGAMEDIR:STRING="bin" \
34	--with-extra-includes=${LOCALBASE}/include/libpng15 \	27	-DTOLUA++_APP:STRING="${TOLUAXX_CMD}" \
35	--with-extra-libs=${LUA_LIBDIR} \	28	-DTOLUA++_INCLUDE_DIR:STRING="${LUA_INCDIR}" \
36	--without-gles	29	-DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so"
37	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	30	MAKE_JOBS_SAFE= yes
38	MAKE_JOBS_UNSAFE= yes
39		31
		32	MAN6= stratagus.6
40	PORTDOCS= *	33	PORTDOCS= *
41	PLIST_FILES= bin/stratagus	34	PLIST_FILES= bin/png2stratagus bin/stratagus sbin/metaserver
42		35
43	.include <bsd.port.options.mk>	36	.include <bsd.port.options.mk>
44		37
45	.if ${PORT_OPTIONS:MMIKMOD}	38	.if ${PORT_OPTIONS:MMIKMOD}
46	LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod	39	LIB_DEPENDS+= mikmod:${PORTSDIR}/audio/libmikmod
47	CONFIGURE_ARGS+=--with-mikmod	40	CMAKE_ARGS+= -DWITH_MIKMOD:BOOL=ON
48	.else	41	.else
49	CONFIGURE_ARGS+=--without-mikmod	42	CMAKE_ARGS+= -DWITH_MIKMOD:BOOL=OFF
50	.endif	43	.endif
51		44
52	.if ${PORT_OPTIONS:MMNG}	45	.if ${PORT_OPTIONS:MMNG}
53	LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng	46	LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng
54	CONFIGURE_ARGS+=--with-mng	47	CMAKE_ARGS+= -DWITH_MNG:BOOL=ON
55	.else	48	.else
56	CONFIGURE_ARGS+=--without-mng	49	CMAKE_ARGS+= -DWITH_MNG:BOOL=OFF
57	.endif	50	.endif
58		51
59	.if ${PORT_OPTIONS:MTHEORA}	52	.if ${PORT_OPTIONS:MTHEORA}
60	LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora	53	LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora
61	CONFIGURE_ARGS+=--with-theora	54	CMAKE_ARGS+= -DWITH_THEORA:BOOL=ON
62	.else	55	.else
63	CONFIGURE_ARGS+=--without-theora	56	CMAKE_ARGS+= -DWITH_THEORA:BOOL=OFF
64	.endif	57	.endif
65		58
66	.if ${PORT_OPTIONS:MVORBIS}	59	.if ${PORT_OPTIONS:MVORBIS}
67	LIB_DEPENDS+= vorbisfile.6:${PORTSDIR}/audio/libvorbis	60	LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
68	CONFIGURE_ARGS+=--with-vorbis	61	CMAKE_ARGS+= -DWITH_OGGVORBIS:BOOL=ON
69	.else	62	.else
70	CONFIGURE_ARGS+=--without-vorbis	63	CMAKE_ARGS+= -DWITH_OGGVORBIS:BOOL=OFF
71	.endif	64	.endif
72		65
73	pre-configure:	66	post-install:
74	@(cd ${WRKSRC}; ./autogen.sh)	67	(cd ${WRKSRC}/doc && ${INSTALL_DATA} stratagus.6 ${MAN6PREFIX}/man/man6)
75
76	do-install:
77	${INSTALL_PROGRAM} ${WRKSRC}/stratagus ${PREFIX}/bin
78	.if ${PORT_OPTIONS:MDOCS}	68	.if ${PORT_OPTIONS:MDOCS}
79	@${MKDIR} ${DOCSDIR}	69	@${MKDIR} ${DOCSDIR}
80	@(cd ${WRKSRC}/doc; ${COPYTREE_SHARE} . ${DOCSDIR})	70	(cd ${WRKSRC}/doc && ${INSTALL_DATA} [a-z].html .txt ${DOCSDIR})
81	.endif	71	@${MKDIR} ${DOCSDIR}/graphics
		72	(cd ${WRKSRC}/doc/graphics && ${INSTALL_DATA} * ${DOCSDIR}/graphics)
		73	@${MKDIR} ${DOCSDIR}/scripts
		74	(cd ${WRKSRC}/doc/scripts && ${INSTALL_DATA} * ${DOCSDIR}/scripts)
82	@${ECHO_CMD}	75	@${ECHO_CMD}
83	@${CAT} ${PKGMESSAGE}	76	@${CAT} ${PKGMESSAGE}
84	@${ECHO_CMD}	77	@${ECHO_CMD}
		78	.endif
85		79
86	.include <bsd.port.mk>	80	.include <bsd.port.mk>

Lines 1-28 Link Here

(-)games/stratagus/files/patch-png.cpp (-28 lines)
1	--- src/video/png.cpp.orig 2010-11-20 12:23:28.000000000 +0100
2	+++ src/video/png.cpp 2012-04-29 07:12:14.000000000 +0200
3	@@ -39,6 +39,7 @@
4	#include <stdlib.h>
5	#include <string.h>
6	#include <png.h>
7	+#include <pngpriv.h>
8
9	#include "stratagus.h"
10	#include "video.h"
11	@@ -147,7 +148,7 @@
12	* the normal method of doing things with libpng). REQUIRED unless you
13	* set up your own error handlers in png_create_read_struct() earlier.
14	*/
15	- if (setjmp(png_ptr->jmpbuf)) {
16	+ if (setjmp(png_jmpbuf(png_ptr))) {
17	fprintf(stderr, "Error reading the PNG file.\n");
18	ret = -1;
19	goto done;
20	@@ -343,7 +344,7 @@
21	return;
22	}
23
24	- if (setjmp(png_ptr->jmpbuf)) {
25	+ if (setjmp(png_jmpbuf(png_ptr))) {
26	/* If we get here, we had a problem reading the file */
27	fclose(fp);
28	png_destroy_write_struct(&png_ptr, &info_ptr);