diff options
Diffstat (limited to 'games/demonquake')
| -rw-r--r-- | games/demonquake/Makefile | 8 | ||||
| -rw-r--r-- | games/demonquake/files/patch-gl_image.c | 37 |
2 files changed, 39 insertions, 6 deletions
diff --git a/games/demonquake/Makefile b/games/demonquake/Makefile index c4f5ac745eff..f7d38b07cbcb 100644 --- a/games/demonquake/Makefile +++ b/games/demonquake/Makefile @@ -7,7 +7,7 @@ PORTNAME= demonquake PORTVERSION= 0.16.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake1/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Another improved Quake engine based on FuhQuake LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_GMAKE= yes USE_DOS2UNIX= yes @@ -58,10 +58,6 @@ MAKE_ENV+= BUILD_DEMONQUAKE_SDL=YES PLIST_FILES+= bin/${PORTNAME}-sdl .endif -post-patch: - ${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ - ${WRKSRC}/gl_image.c - do-install: .if !defined(WITHOUT_GLX) ${INSTALL_PROGRAM} ${WRKSRC}/quake/${PORTNAME}-glx ${PREFIX}/bin diff --git a/games/demonquake/files/patch-gl_image.c b/games/demonquake/files/patch-gl_image.c new file mode 100644 index 000000000000..ba72bffe524a --- /dev/null +++ b/games/demonquake/files/patch-gl_image.c @@ -0,0 +1,37 @@ +--- gl_image.c.orig 2012-04-27 12:56:30.000000000 +0200 ++++ gl_image.c 2012-04-27 12:58:31.000000000 +0200 +@@ -21,6 +21,7 @@ + + #include "quakedef.h" + #include <png.h> ++#include <zlib.h> + + int image_width, image_height; + +@@ -470,7 +471,7 @@ + return NULL; + } + +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + { + png_destroy_read_struct (&png, &pnginfo, NULL); + fclose (fin); +@@ -496,7 +497,7 @@ + } + + if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8) +- png_set_gray_1_2_4_to_8 (png); ++ png_set_expand_gray_1_2_4_to_8 (png); + + if (png_get_valid(png, pnginfo, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha (png); +@@ -582,7 +583,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct (&png_ptr, &info_ptr); + fclose (fp); |