Attachment 128505 Details for Bug 172362 – openimageio.patch.txt

openimageio.patch.txt

openimageio.patch.txt (text/plain; charset=UTF-8), 4.12 KB, created by Shane on 2012-10-07 15:55:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2012-10-07 15:55:17 UTC

Size: 4.12 KB

patch

obsolete

>diff -Nru openimageio.orig/Makefile openimageio/Makefile
>--- openimageio.orig/Makefile	2012-10-08 01:21:02.819350974 +1030
>+++ openimageio/Makefile	2012-10-07 22:05:04.505351988 +1030
>@@ -1,12 +1,9 @@
>-# New ports collection makefile for:	OpenImageIO
>-# Date created:			21 March 2012
>-# Whom:					Shane Ambler
>-#
>+# Created by: Shane Ambler <FreeBSD@Shaneware.biz>
> # $FreeBSD: ports/graphics/openimageio/Makefile,v 1.7 2012/09/17 05:24:02 rm Exp $
>-#
> 
> PORTNAME=	openimageio
> PORTVERSION=	1.0.9
>+PORTREVISION=	3
> CATEGORIES=	graphics multimedia
> MASTER_SITES=	https://github.com/OpenImageIO/oiio/tarball/
> DISTNAME=	Release-${PORTVERSION}
>@@ -23,7 +20,6 @@
> 		hdf5:${PORTSDIR}/science/hdf5 \
> 		opencv_legacy:${PORTSDIR}/graphics/opencv \
> 		openjpeg:${PORTSDIR}/graphics/openjpeg \
>-		tbb:${PORTSDIR}/devel/tbb \
> 		webp:${PORTSDIR}/graphics/webp
> 
> # fbm also installs bin/idiff
>@@ -36,16 +32,16 @@
> CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
> 		-DLINKSTATIC:BOOL=OFF \
> 		-DUSE_PYTHON:BOOL=OFF \
>-		-DUSE_TBB:BOOL=ON
>-LDFLAGS+=	-ltbb
>+		-DUSE_TBB:BOOL=OFF
> USE_LDCONFIG=	yes
> WRKSRC=		${WRKDIR}/OpenImageIO-oiio-0d48631/src
> MAKE_JOBS_SAFE=	yes
> 
>-OPTIONS_DEFINE=	DOCS IMAGEVIEWER THREADS
>-OPTIONS_DEFAULT=	DOCS IMAGEVIEWER THREADS
>+OPTIONS_DEFINE=		DOCS IMAGEVIEWER OCIO THREADS
>+OPTIONS_DEFAULT=	DOCS IMAGEVIEWER OCIO THREADS
> 
> IMAGEVIEWER_DESC=	Build image viewer
>+OCIO_DESC=	Colour management support
> 
> .include <bsd.port.options.mk>
> 
>@@ -66,6 +62,13 @@
> PLIST_SUB+=	IMAGEVIEWER="@comment "
> .endif
> 
>+.if ${PORT_OPTIONS:MOCIO}
>+CMAKE_ARGS+=	-DUSE_OCIO:BOOL=ON
>+LIB_DEPENDS+=	OpenColorIO:${PORTSDIR}/graphics/opencolorio
>+.else
>+CMAKE_ARGS+=	-DUSE_OCIO:BOOL=OFF
>+.endif
>+
> .if ${PORT_OPTIONS:MTHREADS}
> CMAKE_ARGS+=	-DNOTHREADS:BOOL=ON
> .else
>@@ -74,8 +77,9 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} == "i386" || ${OSVERSION} < 803000
>-USE_GCC=	4.6+
>+.if ${ARCH} == "i386"
>+# for gcc atomics we need to have an arch > i486
>+CFLAGS+=	-march=i586
> .endif
> 
> .if ${OSVERSION} < 800000
>diff -Nru openimageio.orig/files/patch-include__thread.h openimageio/files/patch-include__thread.h
>--- openimageio.orig/files/patch-include__thread.h	1970-01-01 09:30:00.000000000 +0930
>+++ openimageio/files/patch-include__thread.h	2012-10-07 17:03:43.346351837 +1030
>@@ -0,0 +1,14 @@
>+--- ./include/thread.h.orig	2012-10-07 17:03:13.661351006 +1030
>++++ ./include/thread.h	2012-10-07 17:03:35.809352274 +1030
>+@@ -103,9 +103,9 @@
>+ #endif
>+ 
>+ #if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
>+-#if !defined(__FreeBSD__) || defined(__x86_64__)
>++//#if !defined(__FreeBSD__) || defined(__x86_64__)
>+ #define USE_GCC_ATOMICS
>+-#endif
>++//#endif
>+ #endif
>+ 
>+ OIIO_NAMESPACE_ENTER
>diff -Nru openimageio.orig/pkg-plist openimageio/pkg-plist
>--- openimageio.orig/pkg-plist	2012-10-08 01:21:02.819350974 +1030
>+++ openimageio/pkg-plist	2012-10-07 19:09:26.757351672 +1030
>@@ -6,28 +6,6 @@
> %%IMAGEVIEWER%%bin/iv
> bin/maketx
> bin/oiiotool
>-include/OpenImageIO/tbb/machine/ibm_aix51.h
>-include/OpenImageIO/tbb/machine/linux_common.h
>-include/OpenImageIO/tbb/machine/linux_ia32.h
>-include/OpenImageIO/tbb/machine/linux_ia64.h
>-include/OpenImageIO/tbb/machine/linux_intel64.h
>-include/OpenImageIO/tbb/machine/mac_ppc.h
>-include/OpenImageIO/tbb/machine/windows_ia32.h
>-include/OpenImageIO/tbb/machine/windows_intel64.h
>-include/OpenImageIO/tbb/_tbb_windef.h
>-include/OpenImageIO/tbb/aligned_space.h
>-include/OpenImageIO/tbb/atomic.h
>-include/OpenImageIO/tbb/spin_mutex.h
>-include/OpenImageIO/tbb/spin_rw_mutex.h
>-include/OpenImageIO/tbb/tbb_allocator.h
>-include/OpenImageIO/tbb/tbb_assert_impl.h
>-include/OpenImageIO/tbb/tbb_config.h
>-include/OpenImageIO/tbb/tbb_exception.h
>-include/OpenImageIO/tbb/tbb_machine.h
>-include/OpenImageIO/tbb/tbb_misc.h
>-include/OpenImageIO/tbb/tbb_profiling.h
>-include/OpenImageIO/tbb/tbb_stddef.h
>-include/OpenImageIO/tbb/tbb_version.h
> include/OpenImageIO/argparse.h
> include/OpenImageIO/color.h
> include/OpenImageIO/dassert.h
>@@ -65,6 +43,4 @@
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE
> %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-@dirrm include/OpenImageIO/tbb/machine
>-@dirrm include/OpenImageIO/tbb
> @dirrm include/OpenImageIO

Actions: View

Attachments on bug 172362: 128504 | 128505 | 128506 | 128507 | 128508