Attachment 143860 Details for Bug 191117 – update patch

update patch

openimageio.patch.txt (text/plain), 2.54 KB, created by Shane on 2014-06-17 06:18:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2014-06-17 06:18:16 UTC

Size: 2.54 KB

patch

obsolete

>diff -Nru openimageio.orig/Makefile openimageio/Makefile
>--- openimageio.orig/Makefile	2014-06-17 15:42:11.377535739 +0930
>+++ openimageio/Makefile	2014-06-08 16:18:37.175006603 +0930
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	openimageio
>-PORTVERSION=	1.4.8
>+PORTVERSION=	1.4.9
> PORTREVISION?=	0
> CATEGORIES?=	graphics multimedia
> 
>@@ -15,7 +15,7 @@
> 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 -Nru openimageio.orig/distinfo openimageio/distinfo
>--- openimageio.orig/distinfo	2014-06-17 15:42:11.395536458 +0930
>+++ openimageio/distinfo	2014-06-08 16:18:37.207535911 +0930
>@@ -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 -Nru openimageio.orig/files/patch-src__libutil__ustring.cpp openimageio/files/patch-src__libutil__ustring.cpp
>--- openimageio.orig/files/patch-src__libutil__ustring.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ openimageio/files/patch-src__libutil__ustring.cpp	2014-06-08 01:22:11.029536445 +0930
>@@ -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 -Nru openimageio.orig/pkg-plist openimageio/pkg-plist
>--- openimageio.orig/pkg-plist	2014-06-17 15:42:11.345535542 +0930
>+++ openimageio/pkg-plist	2014-06-08 16:18:37.211777831 +0930
>@@ -49,11 +49,11 @@
> 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

Actions: View

Attachments on bug 191117: 143860