<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/6db652ba1ba2cb3b3b5f3720e423b6db0d668fa6">https://github.com/macports/macports-ports/commit/6db652ba1ba2cb3b3b5f3720e423b6db0d668fa6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6db652ba1ba2cb3b3b5f3720e423b6db0d668fa6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jan 30 03:18:36 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> synfig, synfigstudio: Update to 1.2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ETL: Update to 0.04.22
</span>---
graphics/synfig/Portfile | 32 ++++++++++++++++++--------------
graphics/synfig/files/WorkAreaTile.patch | 13 +++++++++++++
graphics/synfig/files/algorithm.patch | 13 +++++++++++++
graphics/synfig/files/template.patch | 32 ++++++++++++++++++++++++++++++++
4 files changed, 76 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/synfig/Portfile b/graphics/synfig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ac2bb7..43d0f71 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/synfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/synfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> # -*- 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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name synfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup synfig synfig 1.2.0 v
</span> categories graphics
platforms darwin
maintainers ryandesign openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,10 +12,9 @@ license GPL-2+
</span> homepage http://www.synfig.org/
master_sites sourceforge:project/synfig/releases/${version}/source/
dist_subdir ${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default distname {${subport}-${version}}
</span>
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
description vector-based 2-D animation package
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +26,8 @@ if {${subport} eq ${name}} {
</span> at any resolution or framerate), high dynamic range \
images, and a flexible plugin system.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 19fe6bf2ed0daa14534ff7bed4878fe6820261af \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 34cdf9eac90aadea29fb2997e82da1c32713ab02940f7c8873330f894e167fb4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 51f687541f7ea74b65caa3fee1cad694f8534745 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 611ea9f156188c9ecbb99a21116b5330e5070c51a0ffa721c7791c46ec231dbf
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +51,8 @@ if {${subport} eq ${name}} {
</span> port:openexr \
path:lib/pkgconfig/pango.pc:pango
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles template.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --with-boost=${prefix}
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +78,7 @@ if {${subport} eq ${name}} {
</span> }
subport ETL {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 0.04.19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 0.04.22
</span> revision 0
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,15 +89,14 @@ subport ETL {
</span> types and functions from the C++ Standard Template \
Library (STL).
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 1e1458c549460c9e01095f2674dc9a0833ff7b5a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 21696881fab1b9a3458aaa77a8b10c899c297b2d132e3ed4cfb7ffa29cd8b8fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The ETL 0.04.19 tarball was rebuilt with automake 1.15 for the Synfig 1.0.2 release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites macports_distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c9dcf4a0f3ef1cc33b4453416b3ca7c4f0f0f9a6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ac5aeb9b8ec2c69dd455c6c72e104ff20c43e1e5dde6c0cd87f3f7d1b41d2746
</span>
# ETL-config is a wrapper around pkg-config
depends_run port:pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles algorithm.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
set docdir ${destroot}${prefix}/share/doc/${subport}
xinstall -d ${docdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,8 +119,8 @@ subport synfigstudio {
</span> provides a GUI to create Synfig animations which are \
saved in Synfig .sif or .sifz format.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 13db5860638315fad31e21877bff6fc4985444f6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e44584aa0b561f374edcfb792eb601083c7e7e111d68d6fe0356def9682347f5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c0cbbd19c0430ccd18f21c89c9d552776cee34be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 159b6bef1f5a819602f82014f787c22d4c9108af749fcd4505ee37c4979b6c39
</span>
depends_build port:intltool \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,6 +129,8 @@ subport synfigstudio {
</span> port:gtkmm3 \
port:synfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles WorkAreaTile.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
foreach f [glob ${destroot}${prefix}/share/mime/*] {
if {[file isfile ${f}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,3 +160,5 @@ subport synfigstudio {
</span> system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${subport}-${version}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/synfig/files/WorkAreaTile.patch b/graphics/synfig/files/WorkAreaTile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e4539c5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/synfig/files/WorkAreaTile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/synfig/synfig/issues/300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/synfig/synfig/commit/4fcc3f490cc02498491b76e18e80d1be954d04be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/workarea.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/workarea.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,7 +130,7 @@ class WorkAreaTile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ top + (surface ? cairo_image_surface_get_height(surface) : 0) ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ surface() { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bool operator< (const WorkAreaTile &other) { return refresh_id < other.refresh_id; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool operator< (const WorkAreaTile &other) const { return refresh_id < other.refresh_id; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class WorkAreaTileBook
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/synfig/files/algorithm.patch b/graphics/synfig/files/algorithm.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..962820c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/synfig/files/algorithm.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/synfig/synfig/issues/297
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/synfig/synfig/commit/a1232fa5834a109b470322061d1a4d7346c04f83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ETL/_boxblur.h.orig 2016-11-30 04:59:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ETL/_boxblur.h 2017-01-13 00:38:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +29,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* === H E A D E R S ======================================================= */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <algorithm>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* === M A C R O S ========================================================= */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* === T Y P E D E F S ===================================================== */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/synfig/files/template.patch b/graphics/synfig/files/template.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..26299d5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/synfig/files/template.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/synfig/synfig/issues/298
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/synfig/synfig/commit/8406fe911df74868cfcc449ae94fbe364a8290e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/synfig/rendering/software/function/array.h.orig 2016-11-30 05:00:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/synfig/rendering/software/function/array.h 2017-01-13 01:00:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -432,23 +432,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void assign(const Array<TT, Rank> &x) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typename Array<TT, Rank>::Iterator j(x);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for(Iterator i(*this); i && j; ++i, ++j) i.get_array().assign<TT>(j.get_array());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for(Iterator i(*this); i && j; ++i, ++j) i.get_array().template assign<TT>(j.get_array());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename function>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void process(const Type &x) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { for(Iterator i(*this); i; ++i) i.get_array().process<function>(x); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { for(Iterator i(*this); i; ++i) i.get_array().template process<function>(x); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename function, typename TT>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void process(const Array<TT, Rank> &x) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typename Array<TT, Rank>::Iterator j(x);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for(Iterator i(*this); i && j; ++i, ++j) i.get_array().process<function, TT>(j.get_array());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for(Iterator i(*this); i && j; ++i, ++j) i.get_array().template process<function, TT>(j.get_array());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename function>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void process() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { for(Iterator i(*this); i; ++i) i.get_array().process<function>(); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { for(Iterator i(*this); i; ++i) i.get_array().template process<function>(); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename T>
</span></pre><pre style='margin:0'>
</pre>