CVS commit: pkgsrc/graphics/opencolorio

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

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Nov  9 12:30:44 UTC 2023

Modified Files:
        pkgsrc/graphics/opencolorio: distinfo
Added Files:
        pkgsrc/graphics/opencolorio/patches: patch-src_apputils_argparse.cpp
Removed Files:
        pkgsrc/graphics/opencolorio/patches:
            patch-share_cmake_utils_CppVersion.cmake

Log Message:
opencolorio: remove use of alloca to make the package more portable


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/opencolorio/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/opencolorio/patches/patch-share_cmake_utils_CppVersion.cmake
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/opencolorio/patches/patch-src_apputils_argparse.cpp

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.9 pkgsrc/graphics/opencolorio/distinfo:1.10
--- pkgsrc/graphics/opencolorio/distinfo:1.9    Tue Nov  7 20:29:25 2023
+++ pkgsrc/graphics/opencolorio/distinfo        Thu Nov  9 12:30:44 2023
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2023/11/07 20:29:25 nros Exp $
+$NetBSD: distinfo,v 1.10 2023/11/09 12:30:44 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-share_cmake_utils_CppVersion.cmake) = cc546acc672771519f6c01bffedc60eab6c2d6fd
 SHA1 (patch-src_OpenColorIO_OCIOZArchive.cpp) = 07f6832350a400d98f273bacf16a82df1c1031f9
 SHA1 (patch-src_apps_ocioarchive_main.cpp) = 227dc6f8bee4415db6eb54deef8551aee8b2bb36
+SHA1 (patch-src_apputils_argparse.cpp) = 2c0948e891ad340a36f728070ac57b55691cece0

Added files:

Index: pkgsrc/graphics/opencolorio/patches/patch-src_apputils_argparse.cpp
diff -u /dev/null pkgsrc/graphics/opencolorio/patches/patch-src_apputils_argparse.cpp:1.1
--- /dev/null   Thu Nov  9 12:30:44 2023
+++ pkgsrc/graphics/opencolorio/patches/patch-src_apputils_argparse.cpp Thu Nov  9 12:30:44 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_apputils_argparse.cpp,v 1.1 2023/11/09 12:30:44 nros Exp $
+
+Use standard malloc and free instead of non-standard alloca,
+alloca headers and compiler options differentiates on
+different systems.
+
+--- src/apputils/argparse.cpp.orig     2023-11-09 12:01:20.477069989 +0000
++++ src/apputils/argparse.cpp
+@@ -266,10 +266,12 @@ ArgOption::invoke_callback () const
+         return 0;
+ 
+     // Convert the argv's to char*[]
+-    const char **myargv = (const char **) alloca (argc * sizeof(const char *));
++    const char **myargv = (const char **) malloc (argc * sizeof(const char *));
+     for (int i = 0;  i < argc;  ++i)
+         myargv[i] = m_argv[i].c_str();
+-    return invoke_callback (argc, myargv);
++    int retval = invoke_callback (argc, myargv);
++    free(myargv);
++    return retval;
+ }
+ 
+