On Fri, 5 Apr 2024 18:43:32 -0400, Brad Smith wrote:
> On Fri, Apr 05, 2024 at 10:01:29PM +0100, Stuart Henderson wrote:
> > +cc maintainer
> >
> > On 2024/04/05 04:45, Brad Smith wrote:
> > > ping.
> > >
> > > Now that the Blender diff is in.
> >
> > ok.
>
> One last change. One fix for the patch.
OK
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/opencolorio/Makefile,v
> retrieving revision 1.31
> diff -u -p -u -p -r1.31 Makefile
> --- Makefile 23 Sep 2023 16:29:53 -0000 1.31
> +++ Makefile 5 Apr 2024 21:52:07 -0000
> @@ -1,14 +1,12 @@
> -ONLY_FOR_ARCHS = ${CLANG_ARCHS}
> -
> COMMENT = color management library
>
> -EPOCH = 2
> GH_ACCOUNT = AcademySoftwareFoundation
> GH_PROJECT = OpenColorIO
> -GH_TAGNAME = v2.1.1
> +GH_TAGNAME = v2.3.2
> PKGNAME = ${DISTNAME:L}
> +EPOCH = 2
>
> -SHARED_LIBS += OpenColorIO 3.0 # 1.1.1
> +SHARED_LIBS += OpenColorIO 4.0 # 1.1.1
>
> CATEGORIES = graphics
>
> @@ -19,9 +17,9 @@ MAINTAINER = Pascal Stumpf <pascal@stum
> # several BSD-like
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} Imath-3_1 expat m pystring yaml-cpp
> +WANTLIB += ${COMPILER_LIBCXX} Imath-3_1 expat m minizip pystring yaml-cpp z
>
> -COMPILER = base-clang
> +COMPILER = base-clang ports-gcc
>
> MODULES = devel/cmake \
> lang/python
> @@ -30,16 +28,16 @@ BUILD_DEPENDS = devel/boost \
> devel/py-pybind11${MODPY_FLAVOR} \
> devel/py-setuptools${MODPY_FLAVOR} \
> devel/py-wheel${MODPY_FLAVOR}
> -LIB_DEPENDS = devel/pystring \
> +LIB_DEPENDS = archivers/minizip>=4.0.4 \
> + devel/pystring \
> devel/yaml-cpp \
> math/imath
>
> CONFIGURE_ARGS += -DPYTHON="${MODPY_BIN}" \
> -DOCIO_BUILD_STATIC=OFF \
> -DOCIO_BUILD_APPS=OFF \
> - -DOCIO_BUILD_GPU_TESTS=OFF
> -
> -MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
> + -DOCIO_BUILD_GPU_TESTS=OFF \
> + -Dminizip-ng_INCLUDE_DIR="${LOCALBASE}/include/minizip"
>
> .if ${MACHINE_ARCH} == "amd64"
> CONFIGURE_ARGS += -DOCIO_USE_SSE=ON
> @@ -49,10 +47,6 @@ CONFIGURE_ARGS += -DOCIO_USE_SSE=OFF
>
> # everything except tests
> ALL_TARGET = OpenColorIO PyOpenColorIO
> -
> -pre-configure:
> - # custom code fails to find yaml-cpp>=0.8.0
> - rm -f ${WRKSRC}/share/cmake/modules/Findyaml-cpp.cmake
>
> pre-test:
> # build whatever is left (ca. 180 C++ test files)
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/graphics/opencolorio/distinfo,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 distinfo
> --- distinfo 12 Jun 2023 21:29:25 -0000 1.9
> +++ distinfo 5 Apr 2024 21:52:07 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (OpenColorIO-2.1.1.tar.gz) =
> FuvD4PIfctvpD+YEN+uGT01N6cJV744hL4N4JPybjZw=
> -SIZE (OpenColorIO-2.1.1.tar.gz) = 11013141
> +SHA256 (OpenColorIO-2.3.2.tar.gz) =
> a79Of6TqL3Q6I4yyKv9EiQQldxovV/Ys7OFXTkbO7C8=
> +SIZE (OpenColorIO-2.3.2.tar.gz) = 11443450
> Index: patches/patch-src_utils_NumberUtils_h
> ===================================================================
> RCS file:
> /cvs/ports/graphics/opencolorio/patches/patch-src_utils_NumberUtils_h,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 patch-src_utils_NumberUtils_h
> --- patches/patch-src_utils_NumberUtils_h 12 Jun 2023 21:29:25 -0000
> 1.6
> +++ patches/patch-src_utils_NumberUtils_h 5 Apr 2024 21:52:07 -0000
> @@ -1,14 +1,36 @@
> -Fix build failure
> -
> Index: src/utils/NumberUtils.h
> --- src/utils/NumberUtils.h.orig
> +++ src/utils/NumberUtils.h
> -@@ -140,7 +140,7 @@ really_inline from_chars_result from_chars(const char
> +@@ -64,8 +64,10 @@ really_inline from_chars_result from_chars(const char
> + double
> #ifdef _WIN32
> - tempval = _strtol_l(first, &endptr, 0, loc.local);
> - #else
> -- tempval = ::strtol_l(first, &endptr, 0, loc.local);
> -+ tempval = ::strtoll_l(first, &endptr, 0, loc.local);
> + tempval = _strtod_l(first, &endptr, loc.local);
> +-#else
> ++#elif defined(__GLIBC__) || defined(_LIBCPP_VERSION)
> + tempval = ::strtod_l(first, &endptr, loc.local);
> ++#else
> ++ tempval = ::strtod(first, &endptr);
> + #endif
> +
> + if (errno != 0 && errno != EINVAL)
> +@@ -108,8 +110,10 @@ really_inline from_chars_result from_chars(const char
> + #elif __APPLE__
> + // On OSX, strtod_l is for some reason drastically faster than strtof_l.
> + tempval = static_cast<float>(::strtod_l(first, &endptr, loc.local));
> +-#else
> ++#elif defined(__GLIBC__) || defined(_LIBCPP_VERSION)
> + tempval = ::strtof_l(first, &endptr, loc.local);
> ++#else
> ++ tempval = ::strtof(first, &endptr);
> #endif
>
> if (errno != 0)
> +@@ -144,7 +148,7 @@ really_inline from_chars_result from_chars(const char
> + long int
> + #ifdef _WIN32
> + tempval = _strtol_l(first, &endptr, 0, loc.local);
> +-#elif defined(__GLIBC__)
> ++#elif defined(__GLIBC__) || defined(_LIBCPP_VERSION)
> + tempval = ::strtol_l(first, &endptr, 0, loc.local);
> + #else
> + tempval = ::strtol(first, &endptr, 0);
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/graphics/opencolorio/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PLIST
> --- pkg/PLIST 5 Mar 2022 11:30:10 -0000 1.5
> +++ pkg/PLIST 5 Apr 2024 21:52:07 -0000
> @@ -11,6 +11,8 @@ lib/cmake/OpenColorIO/OpenColorIOTargets
> lib/cmake/OpenColorIO/OpenColorIOTargets.cmake
> @lib lib/libOpenColorIO.so.${LIBOpenColorIO_VERSION}
> lib/pkgconfig/OpenColorIO.pc
> -@so lib/python${MODPY_VERSION}/site-packages/PyOpenColorIO.so
> +lib/python${MODPY_VERSION}/site-packages/PyOpenColorIO/
> +@so lib/python${MODPY_VERSION}/site-packages/PyOpenColorIO/PyOpenColorIO.so
> +lib/python${MODPY_VERSION}/site-packages/PyOpenColorIO/__init__.py
> share/ocio/
> share/ocio/setup_ocio.sh
