CVS commit: pkgsrc/graphics/opencolorio

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Nov  9 14:54:03 UTC 2023

Modified Files:
        pkgsrc/graphics/opencolorio: distinfo
Added Files:
        pkgsrc/graphics/opencolorio/patches:
            patch-src_OpenColorIO_CMakeLists.txt patch-src_utils_NumberUtils.h

Log Message:
opencolorio: Fix build on Illumos/solaris, add small portability fix
Solaris and derivates does not have strtod_l and strtof_l.
Solaris ld does not support --exclude-libs as argument.
Use "defined" when looking for preprocessor defines.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/opencolorio/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/opencolorio/patches/patch-src_OpenColorIO_CMakeLists.txt \
    pkgsrc/graphics/opencolorio/patches/patch-src_utils_NumberUtils.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/opencolorio/distinfo
diff -u pkgsrc/graphics/opencolorio/distinfo:1.10 pkgsrc/graphics/opencolorio/distinfo:1.11
--- pkgsrc/graphics/opencolorio/distinfo:1.10   Thu Nov  9 12:30:44 2023
+++ pkgsrc/graphics/opencolorio/distinfo        Thu Nov  9 14:54:03 2023
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.10 2023/11/09 12:30:44 nros Exp $
+$NetBSD: distinfo,v 1.11 2023/11/09 14:54:03 nros Exp $
 
 BLAKE2s (OpenColorIO-2.2.1.tar.gz) = 5fd74fcfa9cc588b7252dcc32df273c69a62a49ccd22b3258f6b2a4d3022624a
 SHA512 (OpenColorIO-2.2.1.tar.gz) = d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
 Size (OpenColorIO-2.2.1.tar.gz) = 11336775 bytes
 SHA1 (patch-share_cmake_modules_Findyaml-cpp.cmake) = e0ae8f97d09ef9c762b419a96a0c091333b4a0c9
 SHA1 (patch-share_cmake_utils_CheckSupportGL.cmake) = f259440166689f7fd8970a61456f111981083733
+SHA1 (patch-src_OpenColorIO_CMakeLists.txt) = 72715406f7cd0e092fcec1808f6682b0ddec8683
 SHA1 (patch-src_OpenColorIO_OCIOZArchive.cpp) = 07f6832350a400d98f273bacf16a82df1c1031f9
 SHA1 (patch-src_apps_ocioarchive_main.cpp) = 227dc6f8bee4415db6eb54deef8551aee8b2bb36
 SHA1 (patch-src_apputils_argparse.cpp) = 2c0948e891ad340a36f728070ac57b55691cece0
+SHA1 (patch-src_utils_NumberUtils.h) = 25bc5722b133402127560727b8f718e211eadc97

Added files:

Index: pkgsrc/graphics/opencolorio/patches/patch-src_OpenColorIO_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/opencolorio/patches/patch-src_OpenColorIO_CMakeLists.txt:1.1
--- /dev/null   Thu Nov  9 14:54:03 2023
+++ pkgsrc/graphics/opencolorio/patches/patch-src_OpenColorIO_CMakeLists.txt    Thu Nov  9 14:54:03 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_OpenColorIO_CMakeLists.txt,v 1.1 2023/11/09 14:54:03 nros Exp $
+
+Solaris linker does not support --exclude-libraries
+
+--- src/OpenColorIO/CMakeLists.txt.orig        2023-01-06 02:05:59.000000000 +0000
++++ src/OpenColorIO/CMakeLists.txt
+@@ -361,7 +361,7 @@ set_target_properties(OpenColorIO PROPER
+     PUBLIC_HEADER "${INSTALL_HEADERS}"
+ )
+ 
+-if(UNIX AND NOT APPLE)
++if(UNIX AND NOT APPLE AND NOT CMAKE_HOST_SOLARIS)
+     # Also hide all the symbols of dependent libraries to prevent clashes if
+     # an app using this project is linked against other versions of our
+     # dependencies.
Index: pkgsrc/graphics/opencolorio/patches/patch-src_utils_NumberUtils.h
diff -u /dev/null pkgsrc/graphics/opencolorio/patches/patch-src_utils_NumberUtils.h:1.1
--- /dev/null   Thu Nov  9 14:54:03 2023
+++ pkgsrc/graphics/opencolorio/patches/patch-src_utils_NumberUtils.h   Thu Nov  9 14:54:03 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_utils_NumberUtils.h,v 1.1 2023/11/09 14:54:03 nros Exp $
+
+Solaris does not have strtod_l and strtof_l
+Portability fix, use "defined" to check for preprocessor defines
+
+--- src/utils/NumberUtils.h.orig       2023-01-06 02:05:59.000000000 +0000
++++ src/utils/NumberUtils.h
+@@ -64,6 +64,8 @@ really_inline from_chars_result from_cha
+     double
+ #ifdef _WIN32
+     tempval = _strtod_l(first, &endptr, loc.local);
++#elif defined(__sun__)
++    tempval = ::strtod(first, &endptr);
+ #else
+     tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+@@ -105,9 +107,11 @@ really_inline from_chars_result from_cha
+ #else
+     tempval = _strtof_l(first, &endptr, loc.local);
+ #endif
+-#elif __APPLE__
++#elif defined(__APPLE__)
+     // On OSX, strtod_l is for some reason drastically faster than strtof_l.
+     tempval = static_cast<float>(::strtod_l(first, &endptr, loc.local));
++#elif defined(__sun__)
++    tempval = ::strtof(first, &endptr);
+ #else
+     tempval = ::strtof_l(first, &endptr, loc.local);
+ #endif