Date: Wed, 24 Dec 2014 00:05:11 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375377 - in head/games/enigma: . files Message-ID: <201412240005.sBO05BbH033651@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Dec 24 00:05:10 2014 New Revision: 375377 URL: https://svnweb.freebsd.org/changeset/ports/375377 QAT: https://qat.redports.org/buildarchive/r375377/ Log: Properly support png 1.5 Obtained from: pkgsrc Added: head/games/enigma/files/patch-lib-src_enigma-core_IMG__SavePNG.c (contents, props changed) Deleted: head/games/enigma/files/patch-src-enigma-core-IMG__SavePNG.c Modified: head/games/enigma/Makefile Modified: head/games/enigma/Makefile ============================================================================== --- head/games/enigma/Makefile Tue Dec 23 23:58:06 2014 (r375376) +++ head/games/enigma/Makefile Wed Dec 24 00:05:10 2014 (r375377) @@ -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} Added: head/games/enigma/files/patch-lib-src_enigma-core_IMG__SavePNG.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/enigma/files/patch-lib-src_enigma-core_IMG__SavePNG.c Wed Dec 24 00:05:10 2014 (r375377) @@ -0,0 +1,26 @@ +--- 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 */ +-static void png_write_data(png_structp ctx, png_bytep area, png_size_t size) ++static void local_png_write_data(png_structp ctx, png_bytep area, png_size_t size) + { + SDL_RWops *src; + +@@ -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_jmpbuf(png_ptr))) { + IMG_SetError("Error writing the PNG file"); + } + else { + int colortype; +- png_set_write_fn(png_ptr, src, png_write_data, png_io_flush); ++ png_set_write_fn(png_ptr, src, local_png_write_data, png_io_flush); + /* Set the image information here. Width and height are up to 2^31, + * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on + * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412240005.sBO05BbH033651>