diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
| commit | 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch) | |
| tree | c04604583d8be53b3ed7f10975be828c731f87cb /games/lbreakout2 | |
| parent | 24315159daa0089f08acea4ba1b130fb6721ad5c (diff) | |
- update png to 1.5.10
Notes
Notes:
svn path=/head/; revision=297915
Diffstat (limited to 'games/lbreakout2')
| -rw-r--r-- | games/lbreakout2/Makefile | 6 | ||||
| -rw-r--r-- | games/lbreakout2/files/patch-stk.c | 35 |
2 files changed, 38 insertions, 3 deletions
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile index c94c019e4859..b264f02c75dd 100644 --- a/games/lbreakout2/Makefile +++ b/games/lbreakout2/Makefile @@ -7,14 +7,14 @@ PORTNAME= lbreakout2 PORTVERSION= 2.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/lgames/${PORTNAME}/${PORTVERSION} MAINTAINER= mmendez@gmail.com COMMENT= The polished successor to LBreakout -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_SDL= mixer net sdl USE_GMAKE= yes @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --enable-sdl-net \ --disable-nls MAKE_JOBS_SAFE= yes -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib post-patch: diff --git a/games/lbreakout2/files/patch-stk.c b/games/lbreakout2/files/patch-stk.c new file mode 100644 index 000000000000..c3dace58d2c9 --- /dev/null +++ b/games/lbreakout2/files/patch-stk.c @@ -0,0 +1,35 @@ +--- gui/stk.c.orig 2005-03-28 19:18:42.000000000 +0200 ++++ gui/stk.c 2012-05-03 07:07:35.000000000 +0200 +@@ -19,6 +19,7 @@ + #include <stdarg.h> + #include <stdlib.h> + #include <png.h> ++#include <pngpriv.h> + #include "stk.h" + + //#define STK_DEBUG +@@ -54,7 +55,7 @@ + + /* Load a PNG type image from an SDL datasource */ + #define IMG_SetError SDL_SetError +-static void png_read_data(png_structp ctx, png_bytep area, png_size_t size) ++static void local_png_read_data(png_structp ctx, png_bytep area, png_size_t size) + { + SDL_RWops *src; + +@@ -105,13 +106,13 @@ + * 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)) ) { + IMG_SetError("Error reading the PNG file."); + goto done; + } + + /* Set up the input control */ +- png_set_read_fn(png_ptr, src, png_read_data); ++ png_set_read_fn(png_ptr, src, local_png_read_data); + + /* Read PNG header info */ + png_read_info(png_ptr, info_ptr); |