<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/0ad963f36c3a8a979cf3f6f7a7a7bfe507250118">https://github.com/macports/macports-ports/commit/0ad963f36c3a8a979cf3f6f7a7a7bfe507250118</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0ad963f36c3a8a979cf3f6f7a7a7bfe507250118
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Oct 24 11:01:22 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> hugin-app: avoid name name conflict with termios.h
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds successfully or not at all.
</span>---
graphics/hugin-app/Portfile | 3 +
graphics/hugin-app/files/patch-terios.diff | 99 ++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+)
<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 ff47607..040f773 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;'>@@ -37,6 +37,9 @@ checksums rmd160 2a0cf1af75d384abca0a62d80480fc815f63e0bf \
</span> # do not assume default values that MacPorts sets
patchfiles-append patch-no_default.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# in /usr/include/sys/termios.h, VT1 is defined as a number
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-terios.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # change how we look for OpenMP
patchfiles-append patch-find_openmp.diff
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/files/patch-terios.diff b/graphics/hugin-app/files/patch-terios.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..200971d
</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-terios.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,99 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hugin_base/vigra_ext/VignettingCorrection.h~ 2016-05-20 11:46:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hugin_base/vigra_ext/VignettingCorrection.h 2017-10-23 18:03:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,24 +42,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace vigra_ext{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template <class VT1, class VT2, class InvResp, class Adjust>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <class vT1, class vT2, class InvResp, class Adjust>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class VigCorrFlatDivFunctor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** the functor's first argument type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef VT1 first_argument_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef vT1 first_argument_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** the functor's second argument type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef VT2 second_argument_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef vT2 second_argument_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** the functor's result type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef typename vigra::NumericTraits<VT1>::RealPromote result_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef typename vigra::NumericTraits<vT1>::RealPromote result_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef result_type RVT1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef typename vigra::NumericTraits<VT2>::RealPromote RVT2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef typename vigra::NumericTraits<vT2>::RealPromote RVT2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VigCorrFlatDivFunctor(RVT2 mean, const InvResp & fr, const Adjust & adj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : m_InvResp(fr), m_Adjust(adj), m_mean(mean)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,17 +82,17 @@
</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;'>+-template <class VT1, class InvResp, class VigFunc, class Adjust>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <class vT1, class InvResp, class VigFunc, class Adjust>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class VigCorrDivFunctor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** the functor's first argument type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef VT1 first_argument_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef vT1 first_argument_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** the functor's result type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef typename vigra::NumericTraits<VT1>::RealPromote result_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef typename vigra::NumericTraits<vT1>::RealPromote result_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef result_type RealVT1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VigCorrDivFunctor(const InvResp & fr, const VigFunc & vf, const Adjust & adj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,13 +115,13 @@
</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;'>+-template <class VT1, class VT2, class InvResp, class Adjust>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <class vT1, class VT2, class InvResp, class Adjust>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class VigCorrFlatAddFunctor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** the functor's first argument type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef VT1 first_argument_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef vT1 first_argument_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** the functor's second argument type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,7 +129,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** the functor's result type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef typename vigra::NumericTraits<VT1>::RealPromote result_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef typename vigra::NumericTraits<vT1>::RealPromote result_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef result_type RealVT1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef typename vigra::NumericTraits<VT2>::RealPromote RVT2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,17 +151,17 @@
</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;'>+-template <class VT1, class InvResp, class VigFunc, class Adjust>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <class vT1, class InvResp, class VigFunc, class Adjust>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class VigCorrAddFunctor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** the functor's first argument type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef VT1 first_argument_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef vT1 first_argument_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** the functor's result type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef typename vigra::NumericTraits<VT1>::RealPromote result_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef typename vigra::NumericTraits<vT1>::RealPromote result_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef result_type RealVT1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>