Date: Wed, 24 Dec 2014 12:29:31 +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: r375450 - in head/graphics/libafterimage: . files Message-ID: <201412241229.sBOCTVbR001132@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Dec 24 12:29:30 2014 New Revision: 375450 URL: https://svnweb.freebsd.org/changeset/ports/375450 QAT: https://qat.redports.org/buildarchive/r375450/ Log: Properly support png 1.5 Obtained from: Gentoo Added: head/graphics/libafterimage/files/patch-libpng15 (contents, props changed) Deleted: head/graphics/libafterimage/files/patch-export.c head/graphics/libafterimage/files/patch-import.c Modified: head/graphics/libafterimage/Makefile Modified: head/graphics/libafterimage/Makefile ============================================================================== --- head/graphics/libafterimage/Makefile Wed Dec 24 12:26:45 2014 (r375449) +++ head/graphics/libafterimage/Makefile Wed Dec 24 12:29:30 2014 (r375450) @@ -15,7 +15,7 @@ LICENSE= LGPL21 LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng15.so:${PORTSDIR}/graphics/png \ + libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ libfreetype.so:${PORTSDIR}/print/freetype2 Added: head/graphics/libafterimage/files/patch-libpng15 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libafterimage/files/patch-libpng15 Wed Dec 24 12:29:30 2014 (r375450) @@ -0,0 +1,31 @@ +--- export.c ++++ export.c +@@ -496,7 +496,7 @@ + png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); + if ( png_ptr != NULL ) + if( (info_ptr = png_create_info_struct(png_ptr)) != NULL ) +- if( setjmp(png_ptr->jmpbuf) ) ++ if( setjmp(png_jmpbuf(png_ptr)) ) + { + png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr); + info_ptr = NULL ; +--- import.c ++++ import.c +@@ -1251,7 +1251,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if ( !setjmp (png_ptr->jmpbuf)) ++ if ( !setjmp (png_jmpbuf(png_ptr))) + { + ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ; + +@@ -1468,7 +1468,7 @@ + + static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) + { +- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr; ++ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr); + memcpy(data, buf->buffer, length); + buf->buffer += length; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412241229.sBOCTVbR001132>