<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/bddb4401adb285f4860620a44c6ace925cc41ac3">https://github.com/macports/macports-ports/commit/bddb4401adb285f4860620a44c6ace925cc41ac3</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 bddb4401adb lensfun: add patch to fix install path - Add missing deps: gettext; py-setuptools - Remove obsolete patch: c++11.patch - Rename existing patchfiles, to specify purpose for each Fixes: https://trac.macports.org/ticket/65244
</span>bddb4401adb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bddb4401adb285f4860620a44c6ace925cc41ac3
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Jun 7 16:27:59 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> lensfun: add patch to fix install path
</span><span style='display:block; white-space:pre;color:#404040;'> - Add missing deps: gettext; py-setuptools
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove obsolete patch: c++11.patch
</span><span style='display:block; white-space:pre;color:#404040;'> - Rename existing patchfiles, to specify purpose for each
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/65244
</span>---
graphics/lensfun/Portfile | 31 +++++++++++++++-------
graphics/lensfun/files/c++11.patch | 29 --------------------
.../files/patch-cmake-apps-install-path.diff | 9 +++++++
....txt.diff => patch-cmake-apps-python-path.diff} | 0
....txt.diff => patch-cmake-docs-rst2man-bin.diff} | 0
5 files changed, 30 insertions(+), 39 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 985426a0c21..24a7b46f62a 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,9 +5,9 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 2
</span> github.setup lensfun lensfun 0.3.3 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 2
</span>
categories graphics
license GPL-3 LGPL-3 CC-BY-SA
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,21 +29,32 @@ checksums rmd160 5580ba7e40ad0da73d7326b18b95ba812b7b1f40 \
</span> # #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:#e0ffe0;'>+set python_branch 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [join [split ${python_branch} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:libpng \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_branch 3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_version [join [split ${python_branch} "."] ""]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # installs python3 helper scripts lensfun-add-adapter lensfun-update-data
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:python${python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Specify path to Python executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cmake-apps-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Specify install path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cmake-apps-install-path.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-docs-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-apps-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Specify name of executable for 'rst2man'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cmake-docs-rst2man-bin.diff
</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>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/c++11.patch
</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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/lensfun/files/patch-cmake-apps-install-path.diff b/graphics/lensfun/files/patch-cmake-apps-install-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9bc07ccac93
</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/patch-cmake-apps-install-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- apps/CMakeLists.txt.orig 2022-06-07 21:23:16.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ apps/CMakeLists.txt 2022-06-07 21:25:05.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,5 +42,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=${SETUP_PY_INSTALL_PREFIX} --root=\$ENV{DESTDIR})")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(PYTHON)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/lensfun/files/patch-apps-CMakeLists.txt.diff b/graphics/lensfun/files/patch-cmake-apps-python-path.diff
</span>similarity index 100%
rename from graphics/lensfun/files/patch-apps-CMakeLists.txt.diff
rename to graphics/lensfun/files/patch-cmake-apps-python-path.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/lensfun/files/patch-docs-CMakeLists.txt.diff b/graphics/lensfun/files/patch-cmake-docs-rst2man-bin.diff
</span>similarity index 100%
rename from graphics/lensfun/files/patch-docs-CMakeLists.txt.diff
rename to graphics/lensfun/files/patch-cmake-docs-rst2man-bin.diff
</pre><pre style='margin:0'>
</pre>