<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/87b9fc402cf848b6c3cb899cf7106354ec82afcf">https://github.com/macports/macports-ports/commit/87b9fc402cf848b6c3cb899cf7106354ec82afcf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 87b9fc402cf848b6c3cb899cf7106354ec82afcf
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Sun Aug 20 09:41:50 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> hugin-app: update version 2016.0.0->2017.0.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/51605
</span>---
graphics/hugin-app/Portfile | 212 ++++++++++++++-------
graphics/hugin-app/files/patch-CMakeLists.txt.diff | 12 --
graphics/hugin-app/files/patch-find_openmp.diff | 20 ++
graphics/hugin-app/files/patch-icns.diff | 28 +++
graphics/hugin-app/files/patch-no_default.diff | 45 +++++
graphics/hugin-app/files/patch-nocxx11.diff | 40 ----
.../files/patch-src-hugin1-hugin1.pch.diff | 12 --
...rc-hugin1-icpfind-AutoCtrlPointCreator.cpp.diff | 13 --
8 files changed, 241 insertions(+), 141 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/Portfile b/graphics/hugin-app/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 17545c4..5fc33ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/hugin-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/hugin-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,15 @@
</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:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# C++11 can be conditionally avoided by using an older version of vigra (1.9.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and a tiny patch below
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span> PortGroup perl5 1.0
PortGroup wxWidgets 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
name hugin-app
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2016.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2017.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,27 +21,55 @@ long_description An easy to use cross-platform panoramic imaging \
</span> pictures and much more.
homepage http://hugin.sourceforge.net
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span> platforms darwin
master_sites sourceforge:project/hugin/hugin/hugin-${branch}
distname hugin-${version}
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> perl5.branches 5.24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-wxWidgets.use wxWidgets-3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9d73e78accbfae2194b347d3d7f7c3932adc018a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b030b05b248b583cf9a26817f5b350303e3ce2c8bc4b43d45f697fbdf55b65e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-image-exiftool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+wxWidgets.use wxWidgets-3.0-cxx11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2a0cf1af75d384abca0a62d80480fc815f63e0bf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 86646ea27f32b959d38e7d36270703214b1ae961e379dd64b14d027139cd4609
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# do not assume default values that MacPorts sets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-no_default.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# change how we look for OpenMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-find_openmp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|___MACPORTS_FIND_OPENMP__|set(OPENMP_FOUND FALSE)|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CMakeLists.txt
</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;'>+# icon files are not installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-icns.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # icon files are not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../hugin/Hugin.icns ${worksrcpath}/src/hugin1/stitch_project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../hugin/PTBatcherGui.icns ${worksrcpath}/src/hugin1/ptbatcher
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use the cmake version of the following packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cmakePackage "LAPACK GLUT GLEW JPEG PNG PackageHandleStandardArgs PkgConfig TIFF ZLIB OpenMP" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/CMakeModules/Find${cmakePackage}.cmake
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# do not find freeglut if installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_FIND_FRAMEWORK=LAST \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_FIND_FRAMEWORK=FIRST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig
</span>
# see http://wiki.panotools.org/Development_of_Open_Source_tools#Dependencies
depends_lib-append \
port:${wxWidgets.port} \
port:boost \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span> port:tiff \
port:libpano13 \
port:jpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,68 +77,125 @@ depends_lib-append \
</span> port:ilmbase \
port:openexr \
port:vigra \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span> port:exiv2 \
port:glew \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lensfun \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tclap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants glew "" x11
</span>
depends_lib-append \
port:flann \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3
</span>
depends_run \
port:enblend \
port:p${perl5.major}-image-exiftool
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO dependencies:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - freeglut or glut, the OpenGL utility toolkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - optionally, lapack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - for the optional Python Scripting Interface (currently functional and tested only on Linux and Windows)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Python version >=2.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SWIG >=2.0 - If Python >=3.2, SWIG must be >=2.0.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# NOTE: maybe the problem was that if swig is installed,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# it gets detected and then requires swig-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and additional python definitions, else it fails to bulid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: try to see where MAC_SELF_CONTAINED_BUNDLE gets defined
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-CMakeLists.txt.diff - include the file declaring check_cxx_source_compiles (report upstream)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-src-hugin1-hugin1.pch.diff - moderately helps with compiler issues
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-hugin1-hugin1.pch.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-hugin1-icpfind-AutoCtrlPointCreator.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if C++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DCMAKE_CXX_FLAGS="-std=c++11"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#patchfiles-append patch-nocxx11.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# nowadays Hugin is transitioning to C++11, so this list probably doesn't make much sense
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Per (an old) README: "Hugin can be compiled with gcc-4.4.4, gcc-4.5.1, and gcc-4.6"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#compiler.blacklist gcc-* apple-gcc-* macports-gcc-4.2 macports-gcc-4.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env PATH="${prefix}/libexec/perl${perl5.major}:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - BOOST is most likely only needed when C++11 support is missing
</span> configure.args-append \
-DINSTALL_OSX_BUNDLE_DIR=${applications_dir} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/2.7/bin/python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_LIBRARY=${prefix}/lib/libpython2.7.dylib \
</span> -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxWidgets_wxrc_EXECUTABLE=${wxWidgets.wxrc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_BOOST=ON -DBOOST_ROOT=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# prevents some compiler errors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# recursive template instantiation exceeded maximum depth of 128
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -ftemplate-depth-1024
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_HSI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LAPACK=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_suffixes {27 36}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_ports {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend pythons_ports python${s}
</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;'>+set any_python 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p python${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set i [lsearch -exact ${pythons_ports} ${p}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c [lreplace ${pythons_ports} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_prefix ${frameworks_dir}/Python.framework/Versions/${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval [subst {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build Python Scripting Interface with Python ${v}" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${p} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${python_prefix}/bin/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${python_prefix}/bin/python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${python_prefix}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${python_prefix}/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_HSI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_HSI=ON
</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;'>+ if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set any_python 1
</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;'>+if {!${any_python}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python27
</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;'>+pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set any_python 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set any_python 1
</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;'>+ if {!${any_python}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "You must choose at least one Python variant."
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant accelerate conflicts atlas openblas description {Use Apple Accelerate Libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LAPACK=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LAPACK=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBLA_VENDOR=Apple
</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;'>+variant atlas conflicts accelerate openblas description {Use MacPorts ATLAS Libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:atlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LAPACK=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LAPACK=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLA_VENDOR=ATLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FindBLAS.cmake and FindLAPACK.cmake do not seem to find MacPorts Atlas properly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLAS_LIBRARIES=satlas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_LIBRARIES=satlas
</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;'>+variant openblas conflicts atlas accelerate description {Use MacPorts OpenBLAS Libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/libopenblas.dylib:openblas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LAPACK=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LAPACK=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBLA_VENDOR=OpenBLAS
</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;'>+if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset openblas]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +accelerate
</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;'>+pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "You must select either the +accelerate, +atlas, or +openblas variant for linear algebra."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "No linear-algebra variant selected."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.type regex
livecheck.url ${homepage}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/files/patch-CMakeLists.txt.diff b/graphics/hugin-app/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4c69fe3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/hugin-app/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Report this upstream
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -280,6 +280,7 @@ IF(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check if we have C++17 <filesystem> header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCLUDE (CheckCXXSourceCompiles)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cxx_source_compiles(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <filesystem>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/files/patch-find_openmp.diff b/graphics/hugin-app/files/patch-find_openmp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..724a1e0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/hugin-app/files/patch-find_openmp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2017-07-30 07:51:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2017-07-30 07:52:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -387,12 +387,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for OpenMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#IF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #we need a special search routine for mac, see changes in file CMakeModules/FindOpenMPMac.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIND_PACKAGE(OpenMPMac)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIND_PACKAGE(OpenMP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #FIND_PACKAGE(OpenMPMac)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ___MACPORTS_FIND_OPENMP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(OPENMP_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(STATUS "Compiler supports OpenMP. Activating support for it.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_COMPILE_OPTIONS(${OpenMP_CXX_FLAGS})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/files/patch-icns.diff b/graphics/hugin-app/files/patch-icns.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1d47002
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/hugin-app/files/patch-icns.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hugin1/stitch_project/CMakeLists.txt.orig 2016-07-20 07:54:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hugin1/stitch_project/CMakeLists.txt 2017-07-27 16:44:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,6 +86,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_EXECUTABLE( ${PROGNAME} MACOSX_BUNDLE hugin_stitch_project.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${ICON_FILES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET_SOURCE_FILES_PROPERTIES(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${ICON_FILES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_PACKAGE_LOCATION Resources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(MAC_SELF_CONTAINED_BUNDLE)
</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;'>+--- src/hugin1/ptbatcher/CMakeLists.txt.orig 2017-04-22 10:03:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hugin1/ptbatcher/CMakeLists.txt 2017-07-27 17:17:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,6 +135,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( ICON_FILES ${MACOSX_BUNDLE_ICON_FILE} ${MACOSX_BUNDLE_TYPE_ICON_FILE} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_EXECUTABLE( ${PROGNAME} MACOSX_BUNDLE ${PTBATCHERGUI_SOURCE} ${PTBATCHERGUI_HEADER} ${ICON_FILES} ${OTHER})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET_SOURCE_FILES_PROPERTIES(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${ICON_FILES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_PACKAGE_LOCATION Resources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(MAC_SELF_CONTAINED_BUNDLE)
</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;color:#808080;'>diff --git a/graphics/hugin-app/files/patch-no_default.diff b/graphics/hugin-app/files/patch-no_default.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6572f74
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/hugin-app/files/patch-no_default.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2017-05-15 08:05:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2017-07-30 07:35:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(COMMAND cmake_policy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (MAC_SELF_CONTAINED_BUNDLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_INCLUDE_PATH ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/include ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/bin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -554,21 +554,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/hugin/data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/${LOCALEDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++ -lc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#IF (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++ -lc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # setup bundle install prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF (NOT MAC_SELF_CONTAINED_BUNDLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF (CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #IF (NOT MAC_SELF_CONTAINED_BUNDLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #IF (CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(INSTALL_OSX_BUNDLE_DIR /Applications/MacPorts CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSE(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #SET(INSTALL_OSX_BUNDLE_DIR /Applications/MacPorts CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ELSE(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fink or other custom system.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(INSTALL_OSX_BUNDLE_DIR ${CMAKE_INSTALL_PREFIX}/Applications CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE("*** Will install application bundles in ${INSTALL_OSX_BUNDLE_DIR}, set INSTALL_OSX_BUNDLE_DIR to change the location")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #SET(INSTALL_OSX_BUNDLE_DIR ${CMAKE_INSTALL_PREFIX}/Applications CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ENDIF(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #MESSAGE("*** Will install application bundles in ${INSTALL_OSX_BUNDLE_DIR}, set INSTALL_OSX_BUNDLE_DIR to change the location")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ENDIF (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF (${HUGIN_SHARED} AND UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/hugin")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/files/patch-nocxx11.diff b/graphics/hugin-app/files/patch-nocxx11.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3e3e112..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/hugin-app/files/patch-nocxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-At the moment hugin-app would still compile without proper C++11 support with a tiny patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(but probably not for much longer).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/hugin_base/hugin_utils/utils.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hugin_base/hugin_utils/utils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +43,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // on unix_like systems don't use CurrentTime, this is defined as a macro in X.h and breaks the debug messages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // on windows we can't use GetCurrentTime because this is replaced with GetTickCount
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+const // It is a const object...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class nullptr_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template<class T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ inline operator T*() const // convertible to any type of null non-member pointer...
</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;'>-+ template<class C, class T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ inline operator T C::*() const // or any type of null member pointer...
</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;'>-+ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void operator&() const; // Can't take address of nullptr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+} nullptr = {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // the full function name is too long..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // #define DEBUG_HEADER hugin_utils::CurrentTime() <<" (" << __FILE__ << ":" << __LINE__ << ") " << __PRETTY_FUNCTION__ << "()" << std::endl << " "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/hugin_base/lensdb/LensDB.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hugin_base/lensdb/LensDB.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -844,7 +844,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</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;'>-- std::ifstream input(filename);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::ifstream input(filename.c_str());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (input.is_open())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (!input.eof())
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff b/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 732594f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/hugin1/hugin1.pch.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hugin1/hugin1.pch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef _HUGIN1_PCH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _HUGIN1_PCH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__cplusplus) && defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <boost/random.hpp>
</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;'>- #ifdef HUGIN_PRECOMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/files/patch-src-hugin1-icpfind-AutoCtrlPointCreator.cpp.diff b/graphics/hugin-app/files/patch-src-hugin1-icpfind-AutoCtrlPointCreator.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4a461c2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/hugin-app/files/patch-src-hugin1-icpfind-AutoCtrlPointCreator.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Report this upstream
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/hugin1/icpfind/AutoCtrlPointCreator.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hugin1/icpfind/AutoCtrlPointCreator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "panoinc.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fstream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined (__GNUC__) && !defined (__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined __GNUC__ && !defined __clang__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ext/stdio_filebuf.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>