CVS commit: pkgsrc/graphics/openimageio

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Mar 22 21:24:24 UTC 2020

Modified Files:
        pkgsrc/graphics/openimageio: Makefile distinfo
Added Files:
        pkgsrc/graphics/openimageio/patches:
            patch-src_libOpenImageIO_imagebufalgo__opencv.cpp

Log Message:
Unrestrict virtual/data size as it is very heavy at least with clang.
Fix drop historic casts that now violate the contract.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/graphics/openimageio/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/openimageio/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__opencv.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/openimageio/Makefile
diff -u pkgsrc/graphics/openimageio/Makefile:1.63 pkgsrc/graphics/openimageio/Makefile:1.64
--- pkgsrc/graphics/openimageio/Makefile:1.63   Tue Mar 17 14:19:02 2020
+++ pkgsrc/graphics/openimageio/Makefile        Sun Mar 22 21:24:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2020/03/17 14:19:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2020/03/22 21:24:23 joerg Exp $
 
 OIIOVER=       1.8.15
 DISTNAME=      oiio-Release-${OIIOVER}
@@ -12,6 +12,8 @@ HOMEPAGE=     https://sites.google.com/site/
 COMMENT=       OpenImageIO is a library for reading and writing images
 LICENSE=       modified-bsd
 
+UNLIMIT_RESOURCES=     datasize virtualsize
+
 USE_CMAKE=             yes
 USE_LANGUAGES=         c gnu++11
 BUILDLINK_TRANSFORM+=  rm:-std=c++11 # for alloca(3)

Index: pkgsrc/graphics/openimageio/distinfo
diff -u pkgsrc/graphics/openimageio/distinfo:1.21 pkgsrc/graphics/openimageio/distinfo:1.22
--- pkgsrc/graphics/openimageio/distinfo:1.21   Tue Mar 17 14:19:02 2020
+++ pkgsrc/graphics/openimageio/distinfo        Sun Mar 22 21:24:23 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2020/03/17 14:19:02 ryoon Exp $
+$NetBSD: distinfo,v 1.22 2020/03/22 21:24:23 joerg Exp $
 
 SHA1 (oiio-Release-1.8.15.tar.gz) = 3c8139af5c68d63a6fecd3096c0b78e34698c57b
 RMD160 (oiio-Release-1.8.15.tar.gz) = b434b141e44e8ce2b4433e286b795654e3f850e4
@@ -8,4 +8,5 @@ SHA1 (patch-Makefile) = 87ba502488af01b2
 SHA1 (patch-src_cmake_install.cmake) = 8db6fbf92878d237dc08a761481febef45cb9f05
 SHA1 (patch-src_cmake_modules_FindOpenEXR.cmake) = c8ff004f262b2d47d4f00dace858a3dad8bd3833
 SHA1 (patch-src_include_OpenImageIO_strutil.h) = 881d5df34c8aa7641f018d64cd8b080534813db2
+SHA1 (patch-src_libOpenImageIO_imagebufalgo__opencv.cpp) = 7664fda90d77db32a13b65adfd758c486edac337
 SHA1 (patch-src_libutil_sysutil.cpp) = 78b8b4d7a5f4d963bdea0cc1739ee5b899898c3c

Added files:

Index: pkgsrc/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp
diff -u /dev/null pkgsrc/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp:1.1
--- /dev/null   Sun Mar 22 21:24:24 2020
+++ pkgsrc/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp       Sun Mar 22 21:24:24 2020
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_libOpenImageIO_imagebufalgo__opencv.cpp,v 1.1 2020/03/22 21:24:24 joerg Exp $
+
+--- src/libOpenImageIO/imagebufalgo_opencv.cpp.orig    2020-03-22 19:49:46.854776697 +0000
++++ src/libOpenImageIO/imagebufalgo_opencv.cpp
+@@ -68,17 +68,17 @@ ImageBufAlgo::from_IplImage (ImageBuf &d
+ #ifdef USE_OPENCV
+     TypeDesc srcformat;
+     switch (ipl->depth) {
+-    case int(IPL_DEPTH_8U) :
++    case IPL_DEPTH_8U :
+         srcformat = TypeDesc::UINT8;  break;
+-    case int(IPL_DEPTH_8S) :
++    case IPL_DEPTH_8S :
+         srcformat = TypeDesc::INT8;  break;
+-    case int(IPL_DEPTH_16U) :
++    case IPL_DEPTH_16U :
+         srcformat = TypeDesc::UINT16;  break;
+-    case int(IPL_DEPTH_16S) :
++    case IPL_DEPTH_16S :
+         srcformat = TypeDesc::INT16;  break;
+-    case int(IPL_DEPTH_32F) :
++    case IPL_DEPTH_32F :
+         srcformat = TypeDesc::FLOAT;  break;
+-    case int(IPL_DEPTH_64F) :
++    case IPL_DEPTH_64F :
+         srcformat = TypeDesc::DOUBLE;  break;
+     default:
+         DASSERT (0 && "unknown IplImage type");