<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/a6b6f455f5bdeb8c0f4721fca3b5a8c571b1ccab">https://github.com/macports/macports-ports/commit/a6b6f455f5bdeb8c0f4721fca3b5a8c571b1ccab</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 a6b6f45 lensfun: Fix building in C++11 mode
</span>a6b6f45 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a6b6f455f5bdeb8c0f4721fca3b5a8c571b1ccab
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Mar 28 18:35:27 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> lensfun: Fix building in C++11 mode
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59172
</span>---
graphics/lensfun/Portfile | 1 +
graphics/lensfun/files/c++11.patch | 29 +++++++++++++++++++++++++++++
2 files changed, 30 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/lensfun/Portfile b/graphics/lensfun/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 69e4cf3..4226fa9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/lensfun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/lensfun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,6 +46,7 @@ depends_run port:python${python_version}
</span>
patchfiles patch-docs-CMakeLists.txt.diff \
patch-apps-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append c++11.patch
</span>
post-patch {
reinplace "s|^#!.*|#!${prefix}/bin/python${python_branch}|" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/lensfun/files/c++11.patch b/graphics/lensfun/files/c++11.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..798350d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/lensfun/files/c++11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Some fixes needed when building in C++11 mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/lensfun/lensfun/commit/694542f350fc7c9ccafa2d9acb4d4e00e690cbdc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/lensfun/cpuid.cpp.orig 2015-11-15 11:07:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/lensfun/cpuid.cpp 2020-03-28 18:34:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,9 +92,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define cpuid(cmd) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __asm volatile ( \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "push %%"R_BX"\n" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "push %%" R_BX "\n" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "cpuid\n" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "pop %%"R_BX"\n" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "pop %%" R_BX "\n" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "=a" (ax), "=c" (cx), "=d" (dx) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "0" (cmd))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/test_modifier.cpp.orig 2015-11-15 11:07:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/test_modifier.cpp 2020-03-28 18:31:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,8 +77,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // check if output becomes NaN when processing geometry conversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void test_mod_projection_borders(lfFixture* lfFix, gconstpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- float in[2] = {lfFix->img_width, lfFix->img_height};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- float in2[2] = {(lfFix->img_width-1)/2, (lfFix->img_height-1)/2};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ float in[2] = {(float) lfFix->img_width, (float) lfFix->img_height};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ float in2[2] = {(float) (lfFix->img_width-1)/2, (float) (lfFix->img_height-1)/2};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float res[2] = {0, 0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lfLensType geom_types [] = {LF_RECTILINEAR, LF_PANORAMIC, LF_EQUIRECTANGULAR, LF_FISHEYE_STEREOGRAPHIC, LF_FISHEYE, LF_FISHEYE_EQUISOLID, LF_FISHEYE_ORTHOGRAPHIC, LF_FISHEYE_THOBY, LF_UNKNOWN};
</span></pre><pre style='margin:0'>
</pre>