CVS commit: pkgsrc/graphics/openimageio

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Fri Mar 17 23:40:13 UTC 2017

Modified Files:
        pkgsrc/graphics/openimageio: distinfo
Added Files:
        pkgsrc/graphics/openimageio/patches:
            patch-src_include_OpenImageIO_imagebufalgo.h

Log Message:
Fix build with opencv 3.2


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/openimageio/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/openimageio/patches/patch-src_include_OpenImageIO_imagebufalgo.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/openimageio/distinfo
diff -u pkgsrc/graphics/openimageio/distinfo:1.16 pkgsrc/graphics/openimageio/distinfo:1.17
--- pkgsrc/graphics/openimageio/distinfo:1.16   Thu Feb  9 00:21:34 2017
+++ pkgsrc/graphics/openimageio/distinfo        Fri Mar 17 23:40:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2017/02/09 00:21:34 joerg Exp $
+$NetBSD: distinfo,v 1.17 2017/03/17 23:40:13 markd Exp $
 
 SHA1 (oiio-Release-1.5.16.tar.gz) = 9e067be3bd191841faaa39352fee66a22352db19
 RMD160 (oiio-Release-1.5.16.tar.gz) = b4d17be7e2d074b2e5a936834c5540242f7603e7
@@ -9,6 +9,7 @@ SHA1 (patch-src_cmake_externalpackages.c
 SHA1 (patch-src_cmake_modules_FindOpenJpeg.cmake) = 5c68708dc0c987c27719e63ab634bcdcde4d7bee
 SHA1 (patch-src_cmake_oiio__macros.cmake) = 37962a7256e1e82b6ffa1b16bfc771ea3812fae3
 SHA1 (patch-src_cmake_platform.cmake) = b7c8f459499563f6aeb0de270087d1993db67af3
+SHA1 (patch-src_include_OpenImageIO_imagebufalgo.h) = d20e5dd48558f96a6312caf0d4734452983c0664
 SHA1 (patch-src_include_OpenImageIO_platform.h) = 5a4d6ab5098f85418fee981b7c737b476797a146
 SHA1 (patch-src_libOpenImageIO_CMakeLists.txt) = 3b6fce87f06d0a7c52559877aacdfcc8ab24b6d8
 SHA1 (patch-src_libutil_sysutil.cpp) = 47a97994fab2006cdb5d576e1fb580a55064703f

Added files:

Index: pkgsrc/graphics/openimageio/patches/patch-src_include_OpenImageIO_imagebufalgo.h
diff -u /dev/null pkgsrc/graphics/openimageio/patches/patch-src_include_OpenImageIO_imagebufalgo.h:1.1
--- /dev/null   Fri Mar 17 23:40:13 2017
+++ pkgsrc/graphics/openimageio/patches/patch-src_include_OpenImageIO_imagebufalgo.h    Fri Mar 17 23:40:13 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_include_OpenImageIO_imagebufalgo.h,v 1.1 2017/03/17 23:40:13 markd Exp $
+
+Build with opencv 3.2
+
+--- src/include/OpenImageIO/imagebufalgo.h.orig        2015-06-11 17:25:58.000000000 +0000
++++ src/include/OpenImageIO/imagebufalgo.h
+@@ -48,7 +48,7 @@
+ 
+ #include <limits>
+ 
+-#ifndef __OPENCV_CORE_TYPES_H__
++#if !defined(__OPENCV_CORE_TYPES_H__) && !defined(OPENCV_CORE_TYPES_H)
+ struct IplImage;  // Forward declaration; used by Intel Image lib & OpenCV
+ #endif
+