<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ae63d8daf8488ba1d569d13dfddfc4061cceb529">https://github.com/macports/macports-ports/commit/ae63d8daf8488ba1d569d13dfddfc4061cceb529</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 ae63d8daf84 lensfun: update to 0.3.4; use py311; set cmake.build_type
</span>ae63d8daf84 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ae63d8daf8488ba1d569d13dfddfc4061cceb529
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Jul 16 11:20:10 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> lensfun: update to 0.3.4; use py311; set cmake.build_type
</span>---
graphics/lensfun/Portfile | 24 +++++++++++++++---------
graphics/lensfun/files/patch-cxx11.diff | 29 -----------------------------
2 files changed, 15 insertions(+), 38 deletions(-)
<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 1eaba56ff44..8a8bf83acd0 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;'>@@ -5,8 +5,8 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup lensfun lensfun 0.3.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup lensfun lensfun 0.3.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 2
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,15 +21,15 @@ long_description Provides a database of photographic lenses and a library \
</span>
homepage https://lensfun.github.io/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5580ba7e40ad0da73d7326b18b95ba812b7b1f40 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4ecfb4b99d2ae83ab864046529081a26bdb97ef935e9cbe3cb19841dcf243eaa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 992550
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6894e8cf7cb5f3c6cb46952bd9f26a5917e9a3a6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6364369eea5d90e2a678bc5bbd1e6cf9612add3b7f50c6f0ab2495c332bf75c4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1058856
</span>
# With 0.3.0 and gcc-4.2:
# #error "I don't know how to change symbol visibility for your compiler"
compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 100}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_branch 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.11
</span> set python_version [join [split ${python_branch} "."] ""]
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,9 +56,6 @@ patchfiles-append patch-cmake-apps-install-path.diff
</span> # Specify name of executable for 'rst2man'
patchfiles-append patch-cmake-docs-rst2man-bin.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for cxx11; see: https://trac.macports.org/ticket/59172
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cxx11.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|^#!.*|#!${prefix}/bin/python${python_branch}|" \
${worksrcpath}/apps/lensfun-add-adapter \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +65,15 @@ post-patch {
</span> ${worksrcpath}/apps/CMakeLists.txt
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Clear optflags; controlled by project, via cmake build type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.optflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type RelWithDebInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type Release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DBUILD_LENSTOOL=ON \
-DINSTALL_HELPER_SCRIPTS=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/lensfun/files/patch-cxx11.diff b/graphics/lensfun/files/patch-cxx11.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 798350d5f59..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/lensfun/files/patch-cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Some fixes needed when building in C++11 mode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/lensfun/lensfun/commit/694542f350fc7c9ccafa2d9acb4d4e00e690cbdc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libs/lensfun/cpuid.cpp.orig 2015-11-15 11:07:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libs/lensfun/cpuid.cpp 2020-03-28 18:34:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,9 +92,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define cpuid(cmd) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __asm volatile ( \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "push %%"R_BX"\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "push %%" R_BX "\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "cpuid\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "pop %%"R_BX"\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "pop %%" R_BX "\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : "=a" (ax), "=c" (cx), "=d" (dx) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : "0" (cmd))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/test_modifier.cpp.orig 2015-11-15 11:07:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/test_modifier.cpp 2020-03-28 18:31:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,8 +77,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // check if output becomes NaN when processing geometry conversion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void test_mod_projection_borders(lfFixture* lfFix, gconstpointer data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- float in[2] = {lfFix->img_width, lfFix->img_height};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- float in2[2] = {(lfFix->img_width-1)/2, (lfFix->img_height-1)/2};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ float in[2] = {(float) lfFix->img_width, (float) lfFix->img_height};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ float in2[2] = {(float) (lfFix->img_width-1)/2, (float) (lfFix->img_height-1)/2};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float res[2] = {0, 0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>