<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[147472] trunk/dports/graphics/hugin-app</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/147472">147472</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-04-04 16:30:19 -0700 (Mon, 04 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>hugin-app: upgrade to 2016.0.0 (#46721)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicshuginappPortfile">trunk/dports/graphics/hugin-app/Portfile</a></li>
<li><a href="#trunkdportsgraphicshuginappfilespatchsrchugin1icpfindAutoCtrlPointCreatorcppdiff">trunk/dports/graphics/hugin-app/files/patch-src-hugin1-icpfind-AutoCtrlPointCreator.cpp.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicshuginappfilespatchCMakeListstxtdiff">trunk/dports/graphics/hugin-app/files/patch-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsgraphicshuginappfilespatchnocxx11diff">trunk/dports/graphics/hugin-app/files/patch-nocxx11.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicshuginappfilespatchsrcforeignvigravigracachedfileimagehxxpatch">trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch</a></li>
<li><a href="#trunkdportsgraphicshuginappfilespatchsrcforeignzthreadincludezthreadGuardhdiff">trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicshuginappPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/hugin-app/Portfile (147471 => 147472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/hugin-app/Portfile 2016-04-04 21:38:35 UTC (rev 147471)
+++ trunk/dports/graphics/hugin-app/Portfile 2016-04-04 23:30:19 UTC (rev 147472)
</span><span class="lines">@@ -3,12 +3,14 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><ins>+# C++11 can be conditionally avoided by using an older version of vigra (1.9.0)
+# and a tiny patch below
+PortGroup cxx11 1.0
</ins><span class="cx"> PortGroup perl5 1.0
</span><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><span class="cx"> name hugin-app
</span><del>-version 2013.0.0
-revision 9
</del><ins>+version 2016.0.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -26,18 +28,18 @@
</span><span class="cx"> distname hugin-${version}
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-# Version 2013 doesn't find "CMakeModules/FindLensfun.cmake" with an out-of-source build
-# (to be reported upstream if the problem persists in new versions)
-#
-# CMake Error at CMakeModules/FindPackageHandleStandardArgs.cmake:51 (MESSAGE):
-# Could not find REQUIRED package Lensfun
-cmake.out_of_source no
</del><ins>+cmake.out_of_source yes
</ins><span class="cx">
</span><span class="cx"> perl5.branches 5.22
</span><span class="cx"> wxWidgets.use wxWidgets-3.0
</span><span class="cx">
</span><del>-depends_build-append port:pkgconfig
-depends_lib port:boost \
</del><ins>+checksums rmd160 9d73e78accbfae2194b347d3d7f7c3932adc018a \
+ sha256 b030b05b248b583cf9a26817f5b350303e3ce2c8bc4b43d45f697fbdf55b65e6
+
+depends_build-append port:pkgconfig \
+ port:p${perl5.major}-image-exiftool
+
+depends_lib-append port:boost \
</ins><span class="cx"> port:exiv2 \
</span><span class="cx"> port:flann \
</span><span class="cx"> port:gettext \
</span><span class="lines">@@ -52,9 +54,12 @@
</span><span class="cx"> port:swig-python \
</span><span class="cx"> port:tclap \
</span><span class="cx"> port:tiff \
</span><ins>+ port:vigra \
</ins><span class="cx"> port:python27 \
</span><span class="cx"> port:${wxWidgets.port}
</span><span class="cx">
</span><ins>+depends_run port:enblend \
+ port:p${perl5.major}-image-exiftool
</ins><span class="cx">
</span><span class="cx"> # TODO dependencies:
</span><span class="cx"> # - freeglut or glut, the OpenGL utility toolkit
</span><span class="lines">@@ -69,30 +74,32 @@
</span><span class="cx">
</span><span class="cx"> # TODO: try to see where MAC_SELF_CONTAINED_BUNDLE gets defined
</span><span class="cx">
</span><del>-# patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch - https://bugs.launchpad.net/bugs/1213586
-# patch-src-foreign-zthread-include-zthread-Guard.h.diff - https://bugs.launchpad.net/bugs/1213585
-# patch-src-hugin1-hugin1.pch.diff - moderately helps with compiler issues
-patchfiles patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch \
- patch-src-foreign-zthread-include-zthread-Guard.h.diff \
</del><ins>+# patch-CMakeLists.txt.diff - include the file declaring check_cxx_source_compiles (report upstream)
+# patch-src-hugin1-hugin1.pch.diff - moderately helps with compiler issues
+patchfiles patch-CMakeLists.txt.diff \
</ins><span class="cx"> patch-src-hugin1-hugin1.pch.diff \
</span><span class="cx"> patch-src-hugin1-icpfind-AutoCtrlPointCreator.cpp.diff
</span><span class="cx">
</span><del>-depends_run port:enblend \
- port:p${perl5.major}-image-exiftool
</del><ins>+# if C++11
+configure.args-append -DCMAKE_CXX_FLAGS="-std=c++11"
+# else
+#patchfiles-append patch-nocxx11.diff
</ins><span class="cx">
</span><del>-checksums rmd160 73261aa925d6284c6950c84fbfdd77e8b0a2ee7d \
- sha256 484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5
</del><ins>+# nowadays Hugin is transitioning to C++11, so this list probably doesn't make much sense
+# Per (an old) README: "Hugin can be compiled with gcc-4.4.4, gcc-4.5.1, and gcc-4.6"
+#compiler.blacklist gcc-* apple-gcc-* macports-gcc-4.2 macports-gcc-4.3
</ins><span class="cx">
</span><del>-# Per the README: "Hugin can be compiled with gcc-4.4.4, gcc-4.5.1, and gcc-4.6"
-compiler.blacklist gcc-* apple-gcc-* macports-gcc-4.2 macports-gcc-4.3
</del><ins>+configure.env PATH="${prefix}/libexec/perl${perl5.major}:$env(PATH)"
</ins><span class="cx">
</span><del>-# TODO: fix this
</del><ins>+# TODO:
+# - BOOST is most likely only needed when C++11 support is missing
</ins><span class="cx"> configure.args-append -DINSTALL_OSX_BUNDLE_DIR=${applications_dir} \
</span><span class="cx"> -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/2.7/bin/python \
</span><span class="cx"> -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7 \
</span><span class="cx"> -DPYTHON_LIBRARY=${prefix}/lib/libpython2.7.dylib \
</span><span class="cx"> -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
</span><del>- -DwxWidgets_wxrc_EXECUTABLE=${wxWidgets.wxrc}
</del><ins>+ -DwxWidgets_wxrc_EXECUTABLE=${wxWidgets.wxrc} \
+ -DUSE_BOOST=ON -DBOOST_ROOT=${prefix}
</ins><span class="cx">
</span><span class="cx"> # prevents some compiler errors
</span><span class="cx"> configure.cxxflags-append -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0
</span></span></pre></div>
<a id="trunkdportsgraphicshuginappfilespatchCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/hugin-app/files/patch-CMakeLists.txt.diff (0 => 147472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/hugin-app/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/graphics/hugin-app/files/patch-CMakeLists.txt.diff 2016-04-04 23:30:19 UTC (rev 147472)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Report this upstream
+
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -280,6 +280,7 @@ IF(WIN32)
+ ENDIF(WIN32)
+
+ # check if we have C++17 <filesystem> header
++INCLUDE (CheckCXXSourceCompiles)
+ check_cxx_source_compiles(
+ "
+ #include <filesystem>
</ins></span></pre></div>
<a id="trunkdportsgraphicshuginappfilespatchnocxx11diff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/hugin-app/files/patch-nocxx11.diff (0 => 147472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/hugin-app/files/patch-nocxx11.diff (rev 0)
+++ trunk/dports/graphics/hugin-app/files/patch-nocxx11.diff 2016-04-04 23:30:19 UTC (rev 147472)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+At the moment hugin-app would still compile without proper C++11 support with a tiny patch
+(but probably not for much longer).
+
+--- src/hugin_base/hugin_utils/utils.h.orig
++++ src/hugin_base/hugin_utils/utils.h
+@@ -43,6 +43,23 @@
+ // on unix_like systems don't use CurrentTime, this is defined as a macro in X.h and breaks the debug messages
+ // on windows we can't use GetCurrentTime because this is replaced with GetTickCount
+
++const // It is a const object...
++class nullptr_t
++{
++ public:
++ template<class T>
++ inline operator T*() const // convertible to any type of null non-member pointer...
++ { return 0; }
++
++ template<class C, class T>
++ inline operator T C::*() const // or any type of null member pointer...
++ { return 0; }
++
++ private:
++ void operator&() const; // Can't take address of nullptr
++
++} nullptr = {};
++
+ #ifdef __GNUC__
+ // the full function name is too long..
+ // #define DEBUG_HEADER hugin_utils::CurrentTime() <<" (" << __FILE__ << ":" << __LINE__ << ") " << __PRETTY_FUNCTION__ << "()" << std::endl << " "
+--- src/hugin_base/lensdb/LensDB.cpp.orig
++++ src/hugin_base/lensdb/LensDB.cpp
+@@ -844,7 +844,7 @@ public:
+ {
+ return false;
+ };
+- std::ifstream input(filename);
++ std::ifstream input(filename.c_str());
+ if (input.is_open())
+ {
+ while (!input.eof())
</ins></span></pre></div>
<a id="trunkdportsgraphicshuginappfilespatchsrcforeignvigravigracachedfileimagehxxpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch (147471 => 147472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch 2016-04-04 21:38:35 UTC (rev 147471)
+++ trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch 2016-04-04 23:30:19 UTC (rev 147472)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-upstream patch
-http://sourceforge.net/p/hugin/hugin/ci/752123441af3ca9d1977081b59f480b9a161247f/
---- src/foreign/vigra/vigra/cachedfileimage.hxx.orig
-+++ src/foreign/vigra/vigra/cachedfileimage.hxx
-@@ -554,7 +554,7 @@
- template <class T, class Notify>
- class NotifyingDirectionSelector<UnstridedArrayTag, T, Notify>
- {
--#ifdef __GNUC__
-+#if defined __GNUC__ && !defined __clang__
- friend class Notify::self_type;
- #else
- friend typename Notify::self_type;
</del></span></pre></div>
<a id="trunkdportsgraphicshuginappfilespatchsrcforeignzthreadincludezthreadGuardhdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff (147471 => 147472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff 2016-04-04 21:38:35 UTC (rev 147471)
+++ trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff 2016-04-04 23:30:19 UTC (rev 147472)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-upstream patch
-http://sourceforge.net/p/hugin/hugin/ci/e07f13ff32a0677de4181f470792dcf770864378/
---- src/foreign/zthread/include/zthread/Guard.h.orig
-+++ src/foreign/zthread/include/zthread/Guard.h
-@@ -108,7 +108,7 @@ class CompoundScope {
- }
-
- template <class LockType>
-- static void createScope(LockHolder<LockType>& l, unsigned long ms) {
-+ static bool createScope(LockHolder<LockType>& l, unsigned long ms) {
-
- if(Scope1::createScope(l, ms))
- if(!Scope2::createScope(l, ms)) {
</del></span></pre></div>
<a id="trunkdportsgraphicshuginappfilespatchsrchugin1icpfindAutoCtrlPointCreatorcppdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/hugin-app/files/patch-src-hugin1-icpfind-AutoCtrlPointCreator.cpp.diff (147471 => 147472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/hugin-app/files/patch-src-hugin1-icpfind-AutoCtrlPointCreator.cpp.diff 2016-04-04 21:38:35 UTC (rev 147471)
+++ trunk/dports/graphics/hugin-app/files/patch-src-hugin1-icpfind-AutoCtrlPointCreator.cpp.diff 2016-04-04 23:30:19 UTC (rev 147472)
</span><span class="lines">@@ -1,10 +1,12 @@
</span><del>---- src/hugin1/icpfind/AutoCtrlPointCreator.cpp.orig 2013-10-27 04:19:02.000000000 -0500
-+++ src/hugin1/icpfind/AutoCtrlPointCreator.cpp 2013-11-26 00:09:46.000000000 -0600
</del><ins>+Report this upstream
+
+--- src/hugin1/icpfind/AutoCtrlPointCreator.cpp.orig
++++ src/hugin1/icpfind/AutoCtrlPointCreator.cpp
</ins><span class="cx"> @@ -28,7 +28,7 @@
</span><span class="cx"> #include "panoinc.h"
</span><span class="cx">
</span><span class="cx"> #include <fstream>
</span><del>--#ifdef __GNUC__
</del><ins>+-#if defined (__GNUC__) && !defined (__FreeBSD__)
</ins><span class="cx"> +#if defined __GNUC__ && !defined __clang__
</span><span class="cx"> #include <ext/stdio_filebuf.h>
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>