diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-12-23 23:39:53 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-12-23 23:39:53 +0000 |
| commit | de40ad94ae9a5a473553e7333d19bcff334564e3 (patch) | |
| tree | 7b4603be91bca96da5b68bad7602b997dcfcb05e | |
| parent | remove useless patch (diff) | |
Properly patch for png 1.5
| -rw-r--r-- | emulators/zsnes/Makefile | 8 | ||||
| -rw-r--r-- | emulators/zsnes/files/patch-zip_zpng.c | 10 | ||||
| -rw-r--r-- | emulators/zsnes/files/patch-zpng.c | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index c67620088125..fbdf8a704718 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -3,7 +3,7 @@ PORTNAME= zsnes PORTVERSION= 1.51 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ZSNES%20v${PORTVERSION} @@ -14,7 +14,7 @@ COMMENT= Intel x86 only Super Nintendo Entertainment System (SNES) Emulator # This must be >= 0.98! BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= non-portable, for a portable emulator see emulators/snes9x @@ -42,8 +42,8 @@ OPENGL_CONFIGURE_ENABLE= opengl AO_LIB_DEPENDS= libao.so:${PORTSDIR}/audio/libao AO_CONFIGURE_ENABLE= libao -CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.options.mk> diff --git a/emulators/zsnes/files/patch-zip_zpng.c b/emulators/zsnes/files/patch-zip_zpng.c new file mode 100644 index 000000000000..fd5b2f8b2cb0 --- /dev/null +++ b/emulators/zsnes/files/patch-zip_zpng.c @@ -0,0 +1,10 @@ +--- zip/zpng.c.orig 2007-01-15 23:06:29 UTC ++++ zip/zpng.c +@@ -129,7 +129,6 @@ int Png_Dump(const char *filename, unsig + png_set_IHDR(png_ptr, info_ptr, width, height, 8, + PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); +- info_ptr->color_type = PNG_COLOR_TYPE_RGB; + + //Allocate an array of scanline pointers + row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep)); diff --git a/emulators/zsnes/files/patch-zpng.c b/emulators/zsnes/files/patch-zpng.c deleted file mode 100644 index 11fe1536d4f4..000000000000 --- a/emulators/zsnes/files/patch-zpng.c +++ /dev/null @@ -1,10 +0,0 @@ ---- zip/zpng.c.orig 2007-01-16 00:06:29.000000000 +0100 -+++ zip/zpng.c 2012-05-06 16:01:13.000000000 +0200 -@@ -21,6 +21,7 @@ - - #ifndef NO_PNG - #include <png.h> -+#include <pngpriv.h> - #endif - - #ifdef __UNIXSDL__ |