Date: Fri, 20 Jun 2014 12:56:53 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358568 - in head/graphics/openimageio: . files Message-ID: <201406201256.s5KCuru7097276@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Fri Jun 20 12:56:53 2014 New Revision: 358568 URL: http://svnweb.freebsd.org/changeset/ports/358568 QAT: https://qat.redports.org/buildarchive/r358568/ Log: Update to 1.4.9. Includes a patch to fix 32-bit builds with GCC. PR: 191117 Submitted by: FreeBSD@ShaneWare.Biz (maintainer) Added: head/graphics/openimageio/files/ head/graphics/openimageio/files/patch-src__libutil__ustring.cpp (contents, props changed) Modified: head/graphics/openimageio/Makefile head/graphics/openimageio/distinfo head/graphics/openimageio/pkg-plist Modified: head/graphics/openimageio/Makefile ============================================================================== --- head/graphics/openimageio/Makefile Fri Jun 20 12:54:29 2014 (r358567) +++ head/graphics/openimageio/Makefile Fri Jun 20 12:56:53 2014 (r358568) @@ -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]* Modified: head/graphics/openimageio/distinfo ============================================================================== --- head/graphics/openimageio/distinfo Fri Jun 20 12:54:29 2014 (r358567) +++ head/graphics/openimageio/distinfo Fri Jun 20 12:56:53 2014 (r358568) @@ -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 Added: head/graphics/openimageio/files/patch-src__libutil__ustring.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openimageio/files/patch-src__libutil__ustring.cpp Fri Jun 20 12:56:53 2014 (r358568) @@ -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; Modified: head/graphics/openimageio/pkg-plist ============================================================================== --- head/graphics/openimageio/pkg-plist Fri Jun 20 12:54:29 2014 (r358567) +++ head/graphics/openimageio/pkg-plist Fri Jun 20 12:56:53 2014 (r358568) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406201256.s5KCuru7097276>