<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/0c6530483f494329805bafb54b39bdb83bd07ad5">https://github.com/macports/macports-ports/commit/0c6530483f494329805bafb54b39bdb83bd07ad5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0c65304 xaos: Update to 3.6
</span>0c65304 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0c6530483f494329805bafb54b39bdb83bd07ad5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Nov 23 14:10:54 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> xaos: Update to 3.6
</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/55396
</span>---
graphics/xaos/Portfile | 23 ++++---
graphics/xaos/files/png.c-r523.diff | 117 ------------------------------------
2 files changed, 11 insertions(+), 129 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/xaos/Portfile b/graphics/xaos/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f64849d..67cf0e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/xaos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/xaos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
name xaos
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6
</span> categories graphics
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span> license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://xaos.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://matek.hu/xaos/doku.php
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/xaos/XaoS/${version}/
</span>
description real-time interactive fractal zoomer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,23 +29,20 @@ long_description XaoS is a fast portable real-time interactive \
</span> (for those of you without drivers licenses), \
palette changing, GIF saving, and fractal inversion.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 465d1469b276501a58bf325e493ea591 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 6d16a58187fba7276e6bd0547cc2fd6bb073b801 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 193553818646fbf2d7c9f0c855ca3123446e16bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4cfe8e7f5b98d28cd320f9ab21a9c2d76d122133 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 989f3e38f7793810cbb1496d5291d44836a7d7c058422b9ee1cffb163a0b8d95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2040707
</span>
depends_lib port:xorg-libXext \
port:libpng \
port:gsl
# Fix "make: `install' is up to date" on case-insensitive filesystems.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Also apply upstream r523 to fix build with libpng 1.5.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.in.diff png.c-r523.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.in.diff
</span>
configure.cflags-append -I${prefix}/include
configure.args --with-long-double=yes \
--disable-nls \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --infodir=${prefix}/share/info \
</span> --x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/xaos/files/png.c-r523.diff b/graphics/xaos/files/png.c-r523.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2fe9083..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/xaos/files/png.c-r523.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,117 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/util/png.c 2011/06/26 21:08:52 522
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/util/png.c 2011/10/30 23:20:18 523
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,6 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef _plan9_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <aconfig.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_PNG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <zlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <png.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,6 +36,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_structp png_ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_infop info_ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_color palette[256];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_color_8 sig_bit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- volatile unsigned short a = 255;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- volatile unsigned char *b = (volatile unsigned char *) &a;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _undefined_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,12 +66,14 @@
</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 "No memory to create png info structure";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(png_ptr->jmpbuf)) {
</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;'>- png_destroy_write_struct(&png_ptr, &info_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fclose(file);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return strerror(errno);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_init_io(png_ptr, file);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef _undefined_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_filter(png_ptr, 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_PAETH |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PNG_FILTER_UP | PNG_FILTER_AVG);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,58 +86,54 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_compression_strategy(png_ptr, Z_DEFAULT_STRATEGY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_compression_window_bits(png_ptr, 15);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_compression_method(png_ptr, 8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->width = image->width;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->height = image->height;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /*info_ptr->gamma=1.0; */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->gamma = 0.5;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (image->palette->type) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case C256:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->bit_depth = image->bytesperpixel * 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->palette = palette;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->valid |= PNG_INFO_PLTE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (i = 0; i < image->palette->end; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->palette[i].red = image->palette->rgb[i][0],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->palette[i].green = image->palette->rgb[i][1],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->palette[i].blue = image->palette->rgb[i][2],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->num_palette = image->palette->end;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_set_IHDR(png_ptr, info_ptr, image->width, image->height,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ image->bytesperpixel * 8, PNG_COLOR_TYPE_PALETTE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PNG_FILTER_TYPE_DEFAULT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (i = 0; i < image->palette->end; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ palette[i].red = image->palette->rgb[i][0];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ palette[i].green = image->palette->rgb[i][1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ palette[i].blue = image->palette->rgb[i][2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_set_PLTE(png_ptr, info_ptr, palette, image->palette->end);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case SMALLITER:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case LARGEITER:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GRAYSCALE:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->bit_depth = image->bytesperpixel * 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_set_IHDR(png_ptr, info_ptr, image->width, image->height,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ image->bytesperpixel * 8, PNG_COLOR_TYPE_GRAY,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PNG_FILTER_TYPE_DEFAULT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case TRUECOLOR:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case TRUECOLOR24:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case TRUECOLOR16:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->bit_depth = 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_set_IHDR(png_ptr, info_ptr, image->width, image->height,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 8, PNG_COLOR_TYPE_RGB,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PNG_FILTER_TYPE_DEFAULT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sig_bit.red = 8 - image->palette->info.truec.rprec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sig_bit.green = 8 - image->palette->info.truec.gprec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sig_bit.blue = 8 - image->palette->info.truec.bprec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_set_sBIT(png_ptr, info_ptr, &sig_bit);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info_ptr->interlace_type = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _undefined_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_text(png_ptr, info_ptr, comments,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sizeof(comments) / sizeof(png_text));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_write_info(png_ptr, info_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_packing(png_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_set_shift(png_ptr, &(info_ptr->sig_bit));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_set_shift(png_ptr, &sig_bit);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (*b == 255)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_swap(png_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_bgr(png_ptr);
</span></pre><pre style='margin:0'>
</pre>