Re: update: graphics/lensfun to 0.3.3

ping, anyone?

On Fri, Apr 21, 2023 at 9:13 AM Abel Abraham Camarillo Ojeda <
acamari@verlet.org> wrote:

> Updates lensfun to 0.3.3. Hundreds of new cameras and lenses.
>
> make test passes: 100% tests passed, 0 tests failed out of 8
> Total Test time (real) = 8.72 sec
>
> Verified with rawtherapee that it shows my previously unsupported camera
> and lenses
>
> I request review of patch-tests_test_modifier_cpp i know nothing of C++.
> Everything else seems straightforward.
>
> Thanks
>
> patch inline and attached (gmail, possibly mangled)
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/lensfun/Makefile,v
> retrieving revision 1.31
> diff -u -p -u -p -r1.31 Makefile
> --- Makefile 11 Mar 2022 19:22:39 -0000 1.31
> +++ Makefile 21 Apr 2023 15:11:08 -0000
> @@ -1,11 +1,12 @@
> COMMENT= library to adjust for photographic lens characteristics
> -DISTNAME= lensfun-0.3.2
> -REVISION= 4
> +GH_ACCOUNT= lensfun
> +GH_PROJECT= lensfun
> +GH_TAGNAME= v0.3.3
>
> -SHARED_LIBS= lensfun 2.0
> +SHARED_LIBS= lensfun 2.1
>
> CATEGORIES= graphics
> -HOMEPAGE= http://lensfun.sourceforge.net/
> +#HOMEPAGE= http://lensfun.sourceforge.net/
>
> # library LGPLv3, lens db CC-BY-SA, build infrastructure/applications
> GPLv3
> PERMIT_PACKAGE= Yes
> @@ -14,7 +15,7 @@ WANTLIB += c glib-2.0 m png ${COMPILER_L
>
> COMPILER = base-clang ports-gcc base-gcc
>
> -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lensfun/}
> +#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lensfun/}
>
> MODULES= devel/cmake \
> lang/python
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/graphics/lensfun/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- distinfo 31 Jan 2017 09:58:35 -0000 1.4
> +++ distinfo 21 Apr 2023 15:11:08 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (lensfun-0.3.2.tar.gz) =
> rovK1GYUykf1vaZbAK9KJXqVZKYXJd+cdMsmDaVE0zE=
> -SIZE (lensfun-0.3.2.tar.gz) = 784825
> +SHA256 (lensfun-0.3.3.tar.gz) =
> V7paA3fySUiXIznhi+lGrxLtoit8cH6w3dJlhjcPZ2U=
> +SIZE (lensfun-0.3.3.tar.gz) = 992432
> Index: patches/patch-cmake_modules_FindGLIB2_cmake
> ===================================================================
> RCS file:
> /cvs/ports/graphics/lensfun/patches/patch-cmake_modules_FindGLIB2_cmake,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-cmake_modules_FindGLIB2_cmake
> --- patches/patch-cmake_modules_FindGLIB2_cmake 11 Mar 2022 19:22:39 -0000
> 1.2
> +++ patches/patch-cmake_modules_FindGLIB2_cmake 21 Apr 2023 15:11:08 -0000
> @@ -1,11 +1,12 @@
> Avoid messing up between paths found by pkg-config and CMake itself.
> ---- cmake/modules/FindGLIB2.cmake.orig Sun Nov 15 18:07:26 2015
> -+++ cmake/modules/FindGLIB2.cmake Sun Jan 29 10:12:03 2017
> +Index: cmake/modules/FindGLIB2.cmake
> +--- cmake/modules/FindGLIB2.cmake.orig
> ++++ cmake/modules/FindGLIB2.cmake
> @@ -1,6 +1,6 @@
> IF (NOT MSVC)
> INCLUDE(FindPkgConfig)
> -- PKG_SEARCH_MODULE( GLIB2 REQUIRED glib-2.0 )
> -+ PKG_SEARCH_MODULE(PC_GLIB2 REQUIRED glib-2.0 )
> +- PKG_SEARCH_MODULE( GLIB2 glib-2.0 )
> ++ PKG_SEARCH_MODULE(PC_GLIB2 glib-2.0 )
> IF(WIN32 AND NOT BUILD_STATIC)
> FIND_FILE(GLIB2_DLL
> NAMES glib-2.dll glib-2-vs9.dll libglib-2.0-0.dll
> Index: patches/patch-tests_test_modifier_cpp
> ===================================================================
> RCS file:
> /cvs/ports/graphics/lensfun/patches/patch-tests_test_modifier_cpp,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-tests_test_modifier_cpp
> --- patches/patch-tests_test_modifier_cpp 11 Mar 2022 19:22:39 -0000 1.2
> +++ patches/patch-tests_test_modifier_cpp 21 Apr 2023 15:11:08 -0000
> @@ -3,7 +3,7 @@ Fix c++11-narrowing with clang6
> Index: tests/test_modifier.cpp
> --- tests/test_modifier.cpp.orig
> +++ tests/test_modifier.cpp
> -@@ -77,8 +77,8 @@ void test_mod_projection_center(lfFixture* lfFix, gcon
> +@@ -78,8 +78,8 @@ void test_mod_projection_center(lfFixture* lfFix, gcon
> // check if output becomes NaN when processing geometry conversion
> void test_mod_projection_borders(lfFixture* lfFix, gconstpointer data)
> {
> @@ -14,3 +14,28 @@ Index: tests/test_modifier.cpp
> float res[2] = {0, 0};
>
> 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};
> +@@ -102,18 +102,18 @@ void test_mod_projection_borders(lfFixture* lfFix,
> gco
> + LF_MODIFY_GEOMETRY, false);
> +
> + if (lfFix->mod->ApplyGeometryDistortion(0,0,1,1,res)) {
> +- g_assert_false(std::isnan(res[0]));
> +- g_assert_false(std::isnan(res[1]));
> ++ g_assert_false(isnan(res[0]));
> ++ g_assert_false(isnan(res[1]));
> + }
> +
> + if
> (lfFix->mod->ApplyGeometryDistortion(in[0],in[1],1,1,res)) {
> +- g_assert_false(std::isnan(res[0]));
> +- g_assert_false(std::isnan(res[1]));
> ++ g_assert_false(isnan(res[0]));
> ++ g_assert_false(isnan(res[1]));
> + }
> +
> + if
> (lfFix->mod->ApplyGeometryDistortion(in2[0],in2[1],1,1,res)) {
> +- g_assert_false(std::isnan(res[0]));
> +- g_assert_false(std::isnan(res[1]));
> ++ g_assert_false(isnan(res[0]));
> ++ g_assert_false(isnan(res[1]));
> + }
> +
> + delete lfFix->mod;
>
>