From f041ab9c9f0dc6e58583ab12e27788b9f9115b09 Mon Sep 17 00:00:00 2001
From: rakuco <rakuco@FreeBSD.org>
Date: Fri, 20 Jun 2014 12:56:53 +0000
Subject: Update to 1.4.9.

Includes a patch to fix 32-bit builds with GCC.

PR:		191117
Submitted by:	FreeBSD@ShaneWare.Biz (maintainer)
---
 graphics/openimageio/Makefile                           |  4 ++--
 graphics/openimageio/distinfo                           |  4 ++--
 .../openimageio/files/patch-src__libutil__ustring.cpp   | 17 +++++++++++++++++
 graphics/openimageio/pkg-plist                          |  4 ++--
 4 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 graphics/openimageio/files/patch-src__libutil__ustring.cpp

diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 81cd7adc4fc0..ee62fec66d2d 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openimageio
-PORTVERSION=	1.4.8
+PORTVERSION=	1.4.9
 PORTREVISION?=	0
 CATEGORIES?=	graphics multimedia
 
@@ -15,7 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageIO
 GH_PROJECT=	oiio
 GH_TAGNAME=	Release-${PORTVERSION}
-GH_COMMIT=	916f05d
+GH_COMMIT=	eb52dfa
 
 # fbm also installs bin/idiff
 CONFLICTS=	fbm-[0-9]*
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 0ca1655bba4a..24dc6d75e14f 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openimageio-1.4.8.tar.gz) = 57e8465711a067e2f57f569d309bc9224249cde406bc4cf2384a4cb5463e04ce
-SIZE (openimageio-1.4.8.tar.gz) = 17423372
+SHA256 (openimageio-1.4.9.tar.gz) = 47b8925857df8da48bca90ae99d373f38fc31da8ec2a5cf350a276ca09536b74
+SIZE (openimageio-1.4.9.tar.gz) = 17532430
diff --git a/graphics/openimageio/files/patch-src__libutil__ustring.cpp b/graphics/openimageio/files/patch-src__libutil__ustring.cpp
new file mode 100644
index 000000000000..091bd98f8d8d
--- /dev/null
+++ b/graphics/openimageio/files/patch-src__libutil__ustring.cpp
@@ -0,0 +1,17 @@
+--- ./src/libutil/ustring.cpp.orig	2014-05-24 01:51:53.000000000 +0930
++++ ./src/libutil/ustring.cpp	2014-06-07 22:05:16.418536133 +0930
+@@ -67,8 +67,13 @@
+ typedef null_lock<null_mutex> ustring_write_lock_t;
+ #endif
+ 
+-
++#if defined(__FreeBSD__) && defined(__i386__) && !defined(__clang__)
++// on a 32bit build using gcc4.2 make_unique() seg faults with the
++// concurrent map enabled when used by openshadinglanguage
++#define USE_CONCURRENT_MAP 0
++#else
+ #define USE_CONCURRENT_MAP 1
++#endif
+ 
+ #if USE_CONCURRENT_MAP
+ typedef unordered_map_concurrent <string_view, ustring::TableRep *, Strutil::StringHash, Strutil::StringEqual, 8> UstringTable;
diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist
index e775732a7474..00b9367d5370 100644
--- a/graphics/openimageio/pkg-plist
+++ b/graphics/openimageio/pkg-plist
@@ -49,11 +49,11 @@ include/OpenImageIO/version.h
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.1
 lib/libOpenImageIO.so.1.4
-lib/libOpenImageIO.so.1.4.8
+lib/libOpenImageIO.so.1.4.9
 lib/libOpenImageIO_Util.so
 lib/libOpenImageIO_Util.so.1
 lib/libOpenImageIO_Util.so.1.4
-lib/libOpenImageIO_Util.so.1.4.8
+lib/libOpenImageIO_Util.so.1.4.9
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
-- 
cgit