Attachment 143299 Details for Bug 190254 – update for openshadinglanguage to 1.4.2 to unbreak it after update to openimageio

[patch] update for openshadinglanguage to 1.4.2 to unbreak it after update to openimageio

openimageio.diff (text/plain), 5.18 KB, created by Guido Falsi on 2014-06-02 21:32:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2014-06-02 21:32:20 UTC

Size: 5.18 KB

patch

obsolete

>Index: graphics/openimageio/Makefile
>===================================================================
>--- graphics/openimageio/Makefile	(revision 356229)
>+++ graphics/openimageio/Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	openimageio
>-PORTVERSION=	1.3.9
>-PORTREVISION?=	4
>+PORTVERSION=	1.4.8
>+PORTREVISION?=	0
> CATEGORIES?=	graphics multimedia
> 
> MAINTAINER?=	FreeBSD@Shaneware.biz
>@@ -15,7 +15,7 @@
> GH_ACCOUNT=	OpenImageIO
> GH_PROJECT=	oiio
> GH_TAGNAME=	Release-${PORTVERSION}
>-GH_COMMIT=	1a57f2f
>+GH_COMMIT=	916f05d
> 
> # fbm also installs bin/idiff
> CONFLICTS=	fbm-[0-9]*
>@@ -24,10 +24,9 @@
> CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
> 		-DLINKSTATIC:BOOL=OFF \
> 		-DNOTHREADS:BOOL=OFF \
>-		-DUSE_TBB:BOOL=OFF \
> 		-DSTOP_ON_WARNING:BOOL=OFF
> 
>-OPTIONS_DEFINE=		DOCS IMAGEVIEWER OCIO
>+OPTIONS_DEFINE=		DOCS IMAGEVIEWER OCIO TEST
> OPTIONS_DEFAULT=	OCIO
> OPTIONS_SUB=		yes
> 
>@@ -34,6 +33,16 @@
> IMAGEVIEWER_DESC=	Build image viewer
> OCIO_DESC=		Colour management support
> 
>+DOCS_CMAKE_ON=		-DINSTALL_DOCS:BOOL=ON
>+DOCS_CMAKE_OFF=		-DINSTALL_DOCS:BOOL=OFF
>+
>+OCIO_CMAKE_ON=		-DUSE_OCIO:BOOL=ON
>+OCIO_CMAKE_OFF=		-DUSE_OCIO:BOOL=OFF
>+OCIO_LIB_DEPENDS=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
>+
>+TEST_CMAKE_ON=		-DOIIO_BUILD_TESTS:BOOL=ON
>+TEST_CMAKE_OFF=		-DOIIO_BUILD_TESTS:BOOL=OFF
>+
> .include <bsd.port.options.mk>
> 
> .if ${SLAVE_PORT} == no
>@@ -53,12 +62,6 @@
> CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DOIIO_BUILD_TOOLS:BOOL=OFF
> .endif
> 
>-.if ${PORT_OPTIONS:MDOCS}
>-CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=ON
>-.else
>-CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=OFF
>-.endif
>-
> .if ${PORT_OPTIONS:MIMAGEVIEWER}
> USE_GL=		glew
> USE_QT4=	corelib gui opengl qmake_build moc_build rcc_build uic_build
>@@ -68,16 +71,14 @@
> CMAKE_ARGS+=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
> .endif
> 
>-.if ${PORT_OPTIONS:MOCIO}
>-CMAKE_ARGS+=	-DUSE_OCIO:BOOL=ON
>-LIB_DEPENDS+=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
>-.else
>-CMAKE_ARGS+=	-DUSE_OCIO:BOOL=OFF
>-.endif
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|share/doc/OpenImageIO|${DOCSDIR}|g' \
>+		${WRKSRC}/CMakeLists.txt
> 
> post-install:
> .if ${SLAVE_PORT} == no
>-	${LN} -sf libOpenImageIO.so.1.3 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
>+	${LN} -sf libOpenImageIO.so.1.4 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
>+	${LN} -sf libOpenImageIO_Util.so.1.4 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
> .endif
> 
> .include <bsd.port.mk>
>Index: graphics/openimageio/distinfo
>===================================================================
>--- graphics/openimageio/distinfo	(revision 356229)
>+++ graphics/openimageio/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (openimageio-1.3.9.tar.gz) = 4f68be9bcb50ebb1e645f8f9204247c90d443e050c26dda2cb7ebdead08cde88
>-SIZE (openimageio-1.3.9.tar.gz) = 14832206
>+SHA256 (openimageio-1.4.8.tar.gz) = 57e8465711a067e2f57f569d309bc9224249cde406bc4cf2384a4cb5463e04ce
>+SIZE (openimageio-1.4.8.tar.gz) = 17423372
>Index: graphics/openimageio/pkg-plist
>===================================================================
>--- graphics/openimageio/pkg-plist	(revision 356229)
>+++ graphics/openimageio/pkg-plist	(working copy)
>@@ -9,6 +9,15 @@
> include/OpenImageIO/color.h
> include/OpenImageIO/dassert.h
> include/OpenImageIO/errorhandler.h
>+include/OpenImageIO/SHA1.h
>+include/OpenImageIO/array_view.h
>+include/OpenImageIO/image_view.h
>+include/OpenImageIO/oiioversion.h
>+include/OpenImageIO/strided_ptr.h
>+include/OpenImageIO/string_ref.h
>+include/OpenImageIO/string_view.h
>+include/OpenImageIO/unittest.h
>+include/OpenImageIO/unordered_map_concurrent.h
> include/OpenImageIO/export.h
> include/OpenImageIO/filesystem.h
> include/OpenImageIO/filter.h
>@@ -39,8 +48,12 @@
> include/OpenImageIO/version.h
> lib/libOpenImageIO.so
> lib/libOpenImageIO.so.1
>-lib/libOpenImageIO.so.1.3
>-lib/libOpenImageIO.so.1.3.9
>+lib/libOpenImageIO.so.1.4
>+lib/libOpenImageIO.so.1.4.8
>+lib/libOpenImageIO_Util.so
>+lib/libOpenImageIO_Util.so.1
>+lib/libOpenImageIO_Util.so.1.4
>+lib/libOpenImageIO_Util.so.1.4.8
> %%PORTDOCS%%%%DOCSDIR%%/CHANGES
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE
> %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
>Index: graphics/openshadinglanguage/Makefile
>===================================================================
>--- graphics/openshadinglanguage/Makefile	(revision 356246)
>+++ graphics/openshadinglanguage/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	openshadinglanguage
>-PORTVERSION=	1.4.0
>-PORTREVISION=	1
>+PORTVERSION=	1.4.2
> CATEGORIES=	graphics devel
> 
> MAINTAINER=	FreeBSD@Shaneware.biz
>@@ -22,7 +21,7 @@
> GH_ACCOUNT=	imageworks
> GH_PROJECT=	OpenShadingLanguage
> GH_TAGNAME=	Release-${PORTVERSION}
>-GH_COMMIT=	fb85664
>+GH_COMMIT=	2c3574d
> 
> CMAKE_ARGS=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config33"
> USE_LDCONFIG=	yes
>Index: graphics/openshadinglanguage/distinfo
>===================================================================
>--- graphics/openshadinglanguage/distinfo	(revision 356246)
>+++ graphics/openshadinglanguage/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (openshadinglanguage-1.4.0.tar.gz) = 866bddfcaed7938a5ca61a7477e60ce7ae899b33d207a5faa7fd46cc72055f69
>-SIZE (openshadinglanguage-1.4.0.tar.gz) = 11513652
>+SHA256 (openshadinglanguage-1.4.2.tar.gz) = c1b20727c9dcfe35c6608e433ff89a73ce8bf4a184598e9bcaae7d09fb6e66ca
>+SIZE (openshadinglanguage-1.4.2.tar.gz) = 11527572

Actions: View | Diff

Attachments on bug 190254: 143114 | 143299