diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-06-20 12:56:53 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-06-20 12:56:53 +0000 |
| commit | 2f0201d68a68b6f38bc96038158bf0fc30f9b0b1 (patch) | |
| tree | 7e3cf21e939d40bd5fbff0a949b3b1c5adfb7af7 | |
| parent | 26b977f43a1fefd413792292c5f43338745e0803 (diff) | |
| download | ports-2f0201d68a68b6f38bc96038158bf0fc30f9b0b1.tar.gz ports-2f0201d68a68b6f38bc96038158bf0fc30f9b0b1.zip | |
Update to 1.4.9.
Includes a patch to fix 32-bit builds with GCC.
PR: 191117
Submitted by: FreeBSD@ShaneWare.Biz (maintainer)
Notes
Notes:
svn path=/head/; revision=358568
| -rw-r--r-- | graphics/openimageio/Makefile | 4 | ||||
| -rw-r--r-- | graphics/openimageio/distinfo | 4 | ||||
| -rw-r--r-- | graphics/openimageio/files/patch-src__libutil__ustring.cpp | 17 | ||||
| -rw-r--r-- | graphics/openimageio/pkg-plist | 4 |
4 files changed, 23 insertions, 6 deletions
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 |