<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c8c542f28c5f71ae0d8814a08507395f77da2606">https://github.com/macports/macports-ports/commit/c8c542f28c5f71ae0d8814a08507395f77da2606</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 c8c542f octave-image: * fixed checksums * added patch to work around "arch x86_64" no found * added compiler_blacklist_versions port group as octave-image 2.6.1 won't build for gcc <= 5.1
</span>c8c542f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c8c542f28c5f71ae0d8814a08507395f77da2606
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Nov 4 14:24:54 2016 -0500
<span style='display:block; white-space:pre;color:#404040;'> octave-image:
</span><span style='display:block; white-space:pre;color:#404040;'> * fixed checksums
</span><span style='display:block; white-space:pre;color:#404040;'> * added patch to work around "arch x86_64" no found
</span><span style='display:block; white-space:pre;color:#404040;'> * added compiler_blacklist_versions port group as octave-image 2.6.1 won't build for gcc <= 5.1
</span>---
math/octave-image/Portfile | 13 ++++++++-----
math/octave-image/files/patch-src-Makefile.in.diff | 8 ++++++++
math/octave-image/files/patch-src_bwdist.cc.diff | 11 -----------
3 files changed, 16 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-image/Portfile b/math/octave-image/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d2dde9c..4da7048 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span> PortGroup octave 1.0
octave.setup image 2.6.1
platforms darwin
license GPL-3+ MIT FreeBSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers mps openmaintainer
</span> description The Octave-forge Image package provides functions \
for processing images. The package also provides \
functions for feature extraction, image \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,12 +16,15 @@ description The Octave-forge Image package provides functions \
</span> much more.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 29dc9385ed9e9e9b436830f00878636571baba6e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 47050112580a5bef615d4083899f73fee4ce59cfc771e80aa114aa837aec1339
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c8e5631c8c9e64c2f2f3b1c5f899a70fb6446506 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a576761094c88b4ea44a977fcdcf47ebc73ed5026cd1180d9884d86d1e89778d
</span>
depends_lib-append port:octave-signal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-src_bwdist.cc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-src-Makefile.in.diff \
</span> patch-src_connectivity.cc.diff
configure.env-append "PREFIX_BIN=${prefix}/bin"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://savannah.gnu.org/bugs/?45096
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append gcc-4.2 gcc-5.0 gcc-5.1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-image/files/patch-src-Makefile.in.diff b/math/octave-image/files/patch-src-Makefile.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..eb4e793
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-image/files/patch-src-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in.orig 2016-10-21 09:19:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in 2016-11-01 07:38:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FLAGGED_MKOCTFILE = @MKOCTFILE@ @XTRA_CXXFLAGS@ @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FLAGGED_MKOCTFILE = @MKOCTFILE@ @XTRA_CXXFLAGS@ -pipe -Os -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## We can't link oct files, and Octave's package system does not handle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## shared libraries. Because of this, we need to create object files for
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-image/files/patch-src_bwdist.cc.diff b/math/octave-image/files/patch-src_bwdist.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 57fd947..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-image/files/patch-src_bwdist.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,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bwdist.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bwdist.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -538,7 +538,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Compute optional 'index to closest object pixel', only if requested
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (nargout > 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (numel >= pow (2, 32))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (numel >= (int) pow ((double)2, (int)32))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- retval(1) = calc_index<uint64NDArray> (bw, xdist, ydist);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- retval(1) = calc_index<uint32NDArray> (bw, xdist, ydist);
</span></pre><pre style='margin:0'>
</pre>