aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/enigma/Makefile2
-rw-r--r--games/enigma/files/patch-lib-src_enigma-core_IMG__SavePNG.c (renamed from games/enigma/files/patch-src-enigma-core-IMG__SavePNG.c)17
2 files changed, 6 insertions, 13 deletions
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index ea8ec363a9e2..f895ac2e9aab 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -21,7 +21,7 @@ USE_SDL= image mixer sdl ttf
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-cxxlua \
--with-libintl-prefix="${LOCALBASE}"
-CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 -I${LUA_INCDIR}
+CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR}
LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/enigma/files/patch-src-enigma-core-IMG__SavePNG.c b/games/enigma/files/patch-lib-src_enigma-core_IMG__SavePNG.c
index 925b9655d5e9..9363c5f152a9 100644
--- a/games/enigma/files/patch-src-enigma-core-IMG__SavePNG.c
+++ b/games/enigma/files/patch-lib-src_enigma-core_IMG__SavePNG.c
@@ -1,13 +1,6 @@
---- lib-src/enigma-core/IMG_SavePNG.c.orig 2007-09-08 14:20:05.000000000 +0200
-+++ lib-src/enigma-core/IMG_SavePNG.c 2012-05-11 17:55:39.000000000 +0200
-@@ -1,13 +1,14 @@
- #include "SDL.h"
- #include "IMG_SavePNG.h"
- #include "png.h"
-+#include "pngpriv.h"
- #include <stdlib.h>
- #include <setjmp.h>
-
+--- lib-src/enigma-core/IMG_SavePNG.c.orig 2007-09-08 12:20:05 UTC
++++ lib-src/enigma-core/IMG_SavePNG.c
+@@ -7,7 +7,7 @@
#define IMG_SetError(a) SDL_SetError(a)
/* Save a PNG type image to an SDL datasource */
@@ -16,12 +9,12 @@
{
SDL_RWops *src;
-@@ -84,12 +85,12 @@
+@@ -84,12 +84,12 @@ int IMG_SavePNG_RW(SDL_Surface *face, SD
png_bytep *row_pointers = 0;
/* Set error handling. */
- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_ptr->longjmp_buffer)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
IMG_SetError("Error writing the PNG file");
}
else {