Release 1.1.2 (5 Dec 2012)

--------------------------
* maketx fixes -- was botching creation of textures from source images that
  were crop windows (pixel window smaller than display window).
* Minor bug fix to Timer when repeatedly starting and restopping (Apple only).
* Bug fix in ustring:find_last_not_of

6 files changed, 145 insertions, 26 deletions

diff --git a/graphics/openimageio/DESCR b/graphics/openimageio/DESCR
index 01bc8ae6edd..c009e407c24 100644
--- a/graphics/openimageio/DESCR
+++ b/graphics/openimageio/DESCR
@@ -1,7 +1,6 @@
-OpenImageIO is a library for reading and writing images, and a
-bunch of related classes, utilities, and applications.  There is
-a particular emphasis on formats and functionality used in
-professional, large-scale animation and visual effects work for
-film.  OpenImageIO is used extensively in animation and VFX studios
-all over the world, and is also incorporated into several commercial
+OpenImageIO is a library for reading and writing images, and a bunch of related
+classes, utilities, and applications. There is a particular emphasis on formats
+and functionality used in professional, large-scale animation and visual
+effects work for film. OpenImageIO is used extensively in animation and VFX
+studios all over the world, and is also incorporated into several commercial
 products.
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 136ab3189fd..723a49a8606 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -1,30 +1,26 @@
-# $NetBSD: Makefile,v 1.1 2012/12/03 12:54:14 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.2 2012/12/08 22:47:40 adam Exp $
 
-DISTNAME=	oiio-Release-1.1.1
-PKGNAME=	${DISTNAME:S/oiio-Release/openimageio/}
+DISTNAME=	Release-1.1.2
+PKGNAME=	${DISTNAME:S/Release/openimageio/}
 CATEGORIES=	graphics
-MASTER_SITES=	-https://github.com/OpenImageIO/oiio/archive/Release-1.1.1.tar.gz
+MASTER_SITES=	https://github.com/OpenImageIO/oiio/archive/
+FETCH_USING=	curl
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	https://sites.google.com/site/openimageio/
 COMMENT=	OpenImageIO is a library for reading and writing images
 LICENSE=	modified-bsd
 
-# Force using "curl" for fetching the distribution file. It is only available
-# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
-FETCH_USING=	curl
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+WRKSRC=		${WRKDIR}/oiio-${DISTNAME}/src
 
-USE_TOOLS+=	gmake
-USE_CMAKE=	yes
-USE_LANGUAGES=	c c++
+USE_CMAKE=		yes
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake
 
 CXXFLAGS+=		-std=c++0x
 
 CMAKE_ARGS+=		-DILMBASE_HOME:STRING=${BUILDLINK_PREFIX.ilmbase}
-CMAKE_ARGS+=		-DOPENJPEG_HOME:STRING=${BUILDLINK_PREFIX.openjpeg}
+CMAKE_ARGS+=		-DOPENJPEG_HOME:STRING=${BUILDLINK_PREFIX.openjpeg15}
 CMAKE_ARGS+=		-DOPENEXR_HOME:STRING=${BUILDLINK_PREFIX.openexr}
 
 post-patch:
@@ -38,7 +34,7 @@ post-patch:
 .include "../../graphics/ilmbase/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/opencv/buildlink3.mk"
-.include "../../graphics/openjpeg/buildlink3.mk"
+.include "../../graphics/openjpeg15/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/graphics/openimageio/buildlink3.mk b/graphics/openimageio/buildlink3.mk
index 7b0d4b42965..9513276f045 100644
--- a/graphics/openimageio/buildlink3.mk
+++ b/graphics/openimageio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/12/03 12:54:14 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2012/12/08 22:47:40 adam Exp $
 
 BUILDLINK_TREE+=	openimageio
 
@@ -8,6 +8,17 @@ OPENIMAGEIO_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.openimageio+=	openimageio>=1.1.1
 BUILDLINK_PKGSRCDIR.openimageio?=	../../graphics/openimageio
 
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/hdf5/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/ilmbase/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
+.include "../../graphics/opencv/buildlink3.mk"
+.include "../../graphics/openjpeg15/buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
 .endif	# OPENIMAGEIO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-openimageio
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 7d00d5032c0..1eddfe26f36 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.1 2012/12/03 12:54:14 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2012/12/08 22:47:40 adam Exp $
 
-SHA1 (oiio-Release-1.1.1.tar.gz) = f46e0a6f42c9fb875702ee526e9bf073110791ea
-RMD160 (oiio-Release-1.1.1.tar.gz) = 3ff3119fcb61ffaa2ec4828a3ce356ac8702ec88
-Size (oiio-Release-1.1.1.tar.gz) = 8217036 bytes
+SHA1 (Release-1.1.2.tar.gz) = d6557d82abcde704efdf6f10a6421dd66e4300ea
+RMD160 (Release-1.1.2.tar.gz) = 6bce81e85cbf3b28c6819be3cb893c3e731c96cc
+Size (Release-1.1.2.tar.gz) = 8217118 bytes
 SHA1 (patch-CMakeLists.txt) = 2923ca84d7981aaaf6494588392444e5ee07f74a
+SHA1 (patch-cmake_modules_FindOpenJpeg.cmake) = 20d15c8ee0a25ab631ed39910b6e441d069760c5
 SHA1 (patch-cmake_oiio__macros.cmake) = 016c4792c1dc85a903477f4c72af26577e1b2bb9
 SHA1 (patch-cmake_platform.cmake) = 841295fbd0ba47dda7224e6536b0a7e6f6ea9558
+SHA1 (patch-dpx.imageio_libdpx_DPXColorConverter.cpp) = 595415e7e2897798df76474dd906e25cdf3a929e
 SHA1 (patch-include_tbb_tbb__machine.h) = 7d9a196397315e0d39dd2f16139e011ab84c5630
 SHA1 (patch-include_tbb_tbb__misc.h) = 27995a9cdb72b182e352b2a649756af2d60fec86
 SHA1 (patch-libutil_sysutil.cpp) = b7484aef56ea239bae20faba1f04c14907557485
diff --git a/graphics/openimageio/patches/patch-cmake_modules_FindOpenJpeg.cmake b/graphics/openimageio/patches/patch-cmake_modules_FindOpenJpeg.cmake
new file mode 100644
index 00000000000..2b61d3d43b3
--- /dev/null
+++ b/graphics/openimageio/patches/patch-cmake_modules_FindOpenJpeg.cmake
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmake_modules_FindOpenJpeg.cmake,v 1.1 2012/12/08 22:47:41 adam Exp $
+
+Where to find openjpeg includes.
+
+--- cmake/modules/FindOpenJpeg.cmake.orig	2012-12-07 21:44:03.000000000 +0000
++++ cmake/modules/FindOpenJpeg.cmake
+@@ -76,7 +76,7 @@ if (OPENJPEG_HOME)
+        ${OPENJPEG_HOME}/lib64)
+   set (OpenJpeg_include_paths
+        ${OpenJpeg_include_paths}
+-       ${OPENJPEG_HOME}/include)
++       ${OPENJPEG_HOME}/include/openjpeg-1.5)
+ endif()
+ 
+ 
diff --git a/graphics/openimageio/patches/patch-dpx.imageio_libdpx_DPXColorConverter.cpp b/graphics/openimageio/patches/patch-dpx.imageio_libdpx_DPXColorConverter.cpp
new file mode 100644
index 00000000000..d30d315dd29
--- /dev/null
+++ b/graphics/openimageio/patches/patch-dpx.imageio_libdpx_DPXColorConverter.cpp
@@ -0,0 +1,96 @@
+$NetBSD: patch-dpx.imageio_libdpx_DPXColorConverter.cpp,v 1.1 2012/12/08 22:47:41 adam Exp $
+
+Define 'max' as unsigned int, because 0xFFFFFFFF does not fit in int.
+
+--- dpx.imageio/libdpx/DPXColorConverter.cpp.orig	2012-12-07 21:29:43.000000000 +0000
++++ dpx.imageio/libdpx/DPXColorConverter.cpp
+@@ -90,7 +90,7 @@ namespace dpx {
+ 		}
+ 	}
+ 
+-	template <typename DATA, int max>
++	template <typename DATA, unsigned int max>
+ 	static inline void ConvertPixelYCbCrToRGB(const DATA CbYCr[3], DATA RGB[3], const float matrix[9]) {
+ 		float tmp;
+ 		for (int i = 0; i < 3; i++) {
+@@ -106,7 +106,7 @@ namespace dpx {
+ 	}
+ 
+ 	// 4:4:4
+-	template <typename DATA, int max>
++	template <typename DATA, unsigned int max>
+ 	static bool ConvertCbYCrToRGB(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
+ 		const float *matrix = GetYCbCrToRGBColorMatrix(space);
+ 		if (matrix == NULL)
+@@ -120,7 +120,7 @@ namespace dpx {
+ 	}
+ 
+ 	// 4:4:4:4
+-	template <typename DATA, int max>
++	template <typename DATA, unsigned int max>
+ 	static bool ConvertCbYCrAToRGBA(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
+ 		const float *matrix = GetYCbCrToRGBColorMatrix(space);
+ 		if (matrix == NULL)
+@@ -135,7 +135,7 @@ namespace dpx {
+ 	}
+ 
+ 	// 4:2:2
+-	template <typename DATA, int max>
++	template <typename DATA, unsigned int max>
+ 	static bool ConvertCbYCrYToRGB(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
+ 		const float *matrix = GetYCbCrToRGBColorMatrix(space);
+ 		if (matrix == NULL)
+@@ -154,7 +154,7 @@ namespace dpx {
+ 	}
+ 
+ 	// 4:2:2:4
+-	template <typename DATA, int max>
++	template <typename DATA, unsigned int max>
+ 	static bool ConvertCbYACrYAToRGBA(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
+ 		const float *matrix = GetYCbCrToRGBColorMatrix(space);
+ 		if (matrix == NULL)
+@@ -390,7 +390,7 @@ namespace dpx {
+ 		}
+ 	}
+ 
+-	template <typename DATA, int max>
++	template <typename DATA, unsigned int max>
+ 	static inline void ConvertPixelRGBToYCbCr(const DATA RGB[3], DATA CbYCr[3], const float matrix[9]) {
+ 		float tmp;
+ 		for (int i = 0; i < 3; i++) {
+@@ -407,7 +407,7 @@ namespace dpx {
+ 	}
+ 
+ 	// 4:4:4
+-	template <typename DATA, int max>
++	template <typename DATA, unsigned int max>
+ 	static bool ConvertRGBToCbYCr(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
+ 		const float *matrix = GetRGBToYCbCrColorMatrix(space);
+ 		if (matrix == NULL)
+@@ -421,7 +421,7 @@ namespace dpx {
+ 	}
+ 
+ 	// 4:4:4:4
+-	template <typename DATA, int max>
++	template <typename DATA, unsigned int max>
+ 	static bool ConvertRGBAToCbYCrA(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
+ 		const float *matrix = GetRGBToYCbCrColorMatrix(space);
+ 		if (matrix == NULL)
+@@ -436,7 +436,7 @@ namespace dpx {
+ 	}
+ 
+ 	// 4:2:2
+-	template <typename DATA, int max>
++	template <typename DATA, unsigned int max>
+ 	static bool ConvertRGBToCbYCrY(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
+ 		const float *matrix = GetRGBToYCbCrColorMatrix(space);
+ 		if (matrix == NULL)
+@@ -454,7 +454,7 @@ namespace dpx {
+ 	}
+ 
+ 	// 4:2:2:4
+-	template <typename DATA, int max>
++	template <typename DATA, unsigned int max>
+ 	static bool ConvertRGBAToCbYACrYA(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
+ 		const float *matrix = GetRGBToYCbCrColorMatrix(space);
+ 		if (matrix == NULL)