<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/18b7b88e702fc9c1a34b15af7358a6a8e5d11472">https://github.com/macports/macports-ports/commit/18b7b88e702fc9c1a34b15af7358a6a8e5d11472</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 18b7b88e702fc9c1a34b15af7358a6a8e5d11472
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jan 20 01:48:41 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> exact-image: Update to 0.9.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/49967
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> evas support is disabled because it does not build.
</span>---
graphics/exact-image/Portfile | 34 ++--------
graphics/exact-image/files/codecs_png.cc.diff | 90 ---------------------------
2 files changed, 5 insertions(+), 119 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/exact-image/Portfile b/graphics/exact-image/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a8867da..b829f20 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/exact-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/exact-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name exact-image
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.8.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.9.2
</span> categories graphics
license GPL-2
maintainers tobias-elze.de:macports openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,51 +19,28 @@ master_sites http://dl.exactcode.de/oss/exact-image/
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8e3f11a94688cc276ca4c29021e4b9231da25629 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b1b5d00e98903b7f87019920b200c600c8cbfe574ec158729566fa37f2641dfd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2ce154670bdb8fd3436cdbf1139b769d63ddc60a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 665b205740b17b4162fae73aa36eb7046f28bb216d612461ca0499ff47a566ba
</span>
depends_build port:pkgconfig
depends_lib port:antigraingeometry \
port:libpng \
port:jasper \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:evas \
</span> port:expat \
port:openexr \
port:lcms
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Undefined symbols: "BarDecode::code25i_t::tol", referenced from: __ZN9BarDecode9code25i_t3tolE$non_lazy_ptr in bardecode.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append gcc-4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: This project has buggy C++ which clang rejects
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# error: variable length array of non-POD element type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://trac.macports.org/ticket/34201
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append *clang*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This project needs to be updated to build with clang++ against libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "$name does not build on Mavericks or later."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "unsupported platform"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles codecs_png.cc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --with-freetype \
--with-libjpeg \
--with-libtiff \
--with-libpng \
--with-jasper \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-evas \
</span> --with-expat \
--with-openexr \
--with-lcms \
--without-bardecode \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-libungif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-evas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-libgif \
</span> --without-lua \
--without-swig \
--without-perl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/exact-image/files/codecs_png.cc.diff b/graphics/exact-image/files/codecs_png.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4f30366..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/exact-image/files/codecs_png.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,90 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- codecs/png.cc.orig 2010-03-03 15:04:44.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ codecs/png.cc 2012-10-26 14:48:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <png.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <zlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +72,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Allocate/initialize the memory for image information. REQUIRED. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- info_ptr = png_create_info_struct(png_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (info_ptr == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (setjmp(png_jmpbuf(png_ptr))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If we get here, we had a problem reading the file */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,12 +100,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_read_info (png_ptr, info_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &interlace_type, int_p_NULL, int_p_NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &interlace_type, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.w = width;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.h = height;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.bps = bit_depth;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- image.spp = info_ptr->channels;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ image.spp = png_get_channels(png_ptr, info_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_uint_32 res_x, res_y;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- res_x = png_get_x_pixels_per_meter(png_ptr, info_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,7 +124,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (color_type == PNG_COLOR_TYPE_PALETTE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_palette_to_rgb(png_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.bps = 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (info_ptr->num_trans)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_bytep trans_alpha;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int num_trans;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_color_16p trans_color;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (num_trans)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.spp = 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.spp = 3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -196,11 +203,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int pass = 0; pass < number_passes; ++pass)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (unsigned int y = 0; y < height; ++y) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- row_pointers[0] = image.getRawData() + y * stride;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_read_rows(png_ptr, row_pointers, png_bytepp_NULL, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_read_rows(png_ptr, row_pointers, (png_bytepp)NULL, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* clean up after the read, and free any memory allocated - REQUIRED */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* that's it */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -224,7 +231,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Allocate/initialize the memory for image information. REQUIRED. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- info_ptr = png_create_info_struct(png_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (info_ptr == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -244,8 +251,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (quality > Z_BEST_COMPRESSION) quality = Z_BEST_COMPRESSION;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_compression_level(png_ptr, quality);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_info_init (info_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Set up our STL stream output control */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_write_fn (png_ptr, stream, &stdstream_write_data, &stdstream_flush_data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>