summaryrefslogtreecommitdiff
path: root/graphics/openimageio
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2020-03-22 21:24:23 +0000
committerjoerg <joerg@pkgsrc.org>2020-03-22 21:24:23 +0000
commit09f0c8bb0fa5d990c22b2465b317bb3945fc5205 (patch)
treed1abfcca8770cfc10787d25cd1617e7383797404 /graphics/openimageio
parent8f8404d3fc4b22f70c8d03da93d631c334b651d4 (diff)
downloadpkgsrc-09f0c8bb0fa5d990c22b2465b317bb3945fc5205.tar.gz
Unrestrict virtual/data size as it is very heavy at least with clang.
Fix drop historic casts that now violate the contract.
Diffstat (limited to 'graphics/openimageio')
-rw-r--r--graphics/openimageio/Makefile4
-rw-r--r--graphics/openimageio/distinfo3
-rw-r--r--graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp28
3 files changed, 33 insertions, 2 deletions
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 3b1776aaaa4..494d46b893b 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -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/openimageio/
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)
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index d441a5111c4..189ee0c260d 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -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) = 87ba502488af01b266afcd8135b9d9ff52fe9752
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
diff --git a/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp b/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp
new file mode 100644
index 00000000000..81340a7e99e
--- /dev/null
+++ b/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp
@@ -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");