Attachment 157744 Details for Bug 200818 – update openimageio to 1.5.16

[patch] update openimageio to 1.5.16

openimageio.patch (text/plain), 5.87 KB, created by Shane on 2015-06-15 02:14:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2015-06-15 02:14:24 UTC

Size: 5.87 KB

patch

obsolete

>diff -Nru openimageio.orig/Makefile openimageio/Makefile
>--- openimageio.orig/Makefile	2015-06-12 20:53:05.792043853 +0930
>+++ openimageio/Makefile	2015-06-12 11:38:56.292334509 +0930
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	openimageio
>-PORTVERSION=	1.4.15
>+PORTVERSION=	1.5.16
> DISTVERSIONPREFIX=	Release-
>-PORTREVISION?=	1
>+PORTREVISION?=	0
> CATEGORIES?=	graphics multimedia
> 
> MAINTAINER?=	FreeBSD@Shaneware.biz
>@@ -19,29 +19,49 @@
> # fbm also installs bin/idiff
> CONFLICTS=	fbm-[0-9]*
> 
>-USES=		cmake:outsource compiler
>+USES=		cmake:outsource
> CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
> 		-DLINKSTATIC:BOOL=OFF \
> 		-DNOTHREADS:BOOL=OFF \
>-		-DSTOP_ON_WARNING:BOOL=OFF
>+		-DSTOP_ON_WARNING:BOOL=OFF \
>+		-DUSE_CPP11:BOOL=OFF \
>+		-DUSE_OPENSSL:BOOL=OFF
>+CXXFLAGS+=	-D__STDC_CONSTANT_MACROS
> 
>-OPTIONS_DEFINE=		DOCS IMAGEVIEWER OCIO TEST
>-OPTIONS_DEFAULT=	OCIO
>+OPTIONS_DEFINE=		DOCS FFMPEG GIF IMAGEVIEWER OCIO RAW TEST
>+OPTIONS_DEFAULT=	OCIO FFMPEG GIF
> OPTIONS_SUB=		yes
> 
>+FFMPEG_DESC=		Use ffmpeg to support extra file types
>+GIF_DESC=		Enable gif image support
> IMAGEVIEWER_DESC=	Build image viewer
> OCIO_DESC=		Colour management support
>+RAW_DESC=		Enable raw image support
> 
> DOCS_CMAKE_ON=		-DINSTALL_DOCS:BOOL=ON
> DOCS_CMAKE_OFF=		-DINSTALL_DOCS:BOOL=OFF
> 
>+FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=ON
>+FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=OFF
>+FFMPEG_LIB_DEPENDS=	libavutil.so:${PORTSDIR}/multimedia/ffmpeg
>+
>+GIF_CMAKE_ON=		-DUSE_GIF:BOOL=ON
>+GIF_CMAKE_OFF=		-DUSE_GIF:BOOL=OFF
>+GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
>+
> OCIO_CMAKE_ON=		-DUSE_OCIO:BOOL=ON
> OCIO_CMAKE_OFF=		-DUSE_OCIO:BOOL=OFF
> OCIO_LIB_DEPENDS=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
> 
>+RAW_CMAKE_ON=		-DUSE_LIBRAW:BOOL=ON
>+RAW_CMAKE_OFF=		-DUSE_LIBRAW:BOOL=OFF
>+RAW_LIB_DEPENDS=	libraw_r.so:${PORTSDIR}/graphics/libraw
>+
> TEST_CMAKE_ON=		-DOIIO_BUILD_TESTS:BOOL=ON
> TEST_CMAKE_OFF=		-DOIIO_BUILD_TESTS:BOOL=OFF
> 
>+PLIST_SUB+=		LIBVERS=${PORTVERSION}
>+
> .include <bsd.port.options.mk>
> 
> .if ${SLAVE_PORT} == no
>@@ -53,12 +73,16 @@
> 		libwebp.so:${PORTSDIR}/graphics/webp
> USE_LDCONFIG=	yes
> CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=OFF -DOIIO_BUILD_TOOLS:BOOL=ON
>+CMAKE_ARGS+=	-DUSE_PYTHON3:BOOL=OFF
> .else
> LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \
> 		libboost_python.so:${PORTSDIR}/devel/boost-python-libs
>-USES+=		python
> PLIST=		${PKGDIR}/pkg-plist-pybind
>-CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DOIIO_BUILD_TOOLS:BOOL=OFF
>+#while oiio supports py3, ports doesn't have py3 support for boost-python yet
>+USES+=		python:2
>+CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON
>+CMAKE_ARGS+=	-DUSE_PYTHON3:BOOL=OFF
>+CMAKE_ARGS+=	-DOIIO_BUILD_TOOLS:BOOL=OFF
> .endif
> 
> .if ${PORT_OPTIONS:MIMAGEVIEWER}
>@@ -70,21 +94,14 @@
> CMAKE_ARGS+=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${COMPILER_TYPE} == gcc
>-# GCC 4.2 does not link with other ports that now use GCC 4.9 or later.
>-USE_GCC=	yes
>-.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.4 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
>-	${LN} -sf libOpenImageIO_Util.so.1.4 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
>+	${LN} -sf libOpenImageIO.so.1.5 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
>+	${LN} -sf libOpenImageIO_Util.so.1.5 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -Nru openimageio.orig/distinfo openimageio/distinfo
>--- openimageio.orig/distinfo	2015-06-12 20:53:05.792043853 +0930
>+++ openimageio/distinfo	2015-06-12 11:40:02.467329930 +0930
>@@ -1,2 +1,2 @@
>-SHA256 (OpenImageIO-oiio-Release-1.4.15_GH0.tar.gz) = 3554b649b9c3cf4c2d61e419b6d4ab4575000994192464bd0f725a9489f8a816
>-SIZE (OpenImageIO-oiio-Release-1.4.15_GH0.tar.gz) = 17551912
>+SHA256 (OpenImageIO-oiio-Release-1.5.16_GH0.tar.gz) = 6c676ae5ddc3b2a8f8d37b521c670d8b3f82d1af583801027d44cf61e1550d6b
>+SIZE (OpenImageIO-oiio-Release-1.5.16_GH0.tar.gz) = 23136543
>diff -Nru openimageio.orig/pkg-plist openimageio/pkg-plist
>--- openimageio.orig/pkg-plist	2015-06-12 20:53:05.792043853 +0930
>+++ openimageio/pkg-plist	2015-01-22 12:55:02.673033551 +1030
>@@ -21,6 +21,7 @@
> include/OpenImageIO/imagebufalgo.h
> include/OpenImageIO/imagecache.h
> include/OpenImageIO/imageio.h
>+include/OpenImageIO/missing_math.h
> include/OpenImageIO/oiioversion.h
> include/OpenImageIO/optparser.h
> include/OpenImageIO/osdep.h
>@@ -32,6 +33,7 @@
> include/OpenImageIO/pugixml.hpp
> include/OpenImageIO/refcnt.h
> include/OpenImageIO/SHA1.h
>+include/OpenImageIO/simd.h
> include/OpenImageIO/strided_ptr.h
> include/OpenImageIO/string_ref.h
> include/OpenImageIO/string_view.h
>@@ -49,12 +51,12 @@
> include/OpenImageIO/version.h
> lib/libOpenImageIO.so
> lib/libOpenImageIO.so.1
>-lib/libOpenImageIO.so.1.4
>-lib/libOpenImageIO.so.1.4.15
>+lib/libOpenImageIO.so.1.5
>+lib/libOpenImageIO.so.%%LIBVERS%%
> lib/libOpenImageIO_Util.so
> lib/libOpenImageIO_Util.so.1
>-lib/libOpenImageIO_Util.so.1.4
>-lib/libOpenImageIO_Util.so.1.4.15
>+lib/libOpenImageIO_Util.so.1.5
>+lib/libOpenImageIO_Util.so.%%LIBVERS%%
> %%PORTDOCS%%%%DOCSDIR%%/CHANGES
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE
> %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
>diff -Nru py-openimageio.orig/Makefile py-openimageio/Makefile
>--- py-openimageio.orig/Makefile	2015-06-12 21:05:06.337993801 +0930
>+++ py-openimageio/Makefile	2015-06-12 20:55:41.766032621 +0930
>@@ -1,17 +1,16 @@
> # Created by: Shane Ambler
> # $FreeBSD$
> 
>-PORTREVISION=	3
> CATEGORIES=	graphics multimedia python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> COMMENT=	OpenImageIO python bindings
> 
> MASTERDIR=	${.CURDIR}/../openimageio
>-OPTIONS_EXCLUDE=DOCS IMAGEVIEWER OCIO
>+OPTIONS_EXCLUDE=DOCS FFMPEG GIF IMAGEVIEWER OCIO RAW TEST
> 
> do-install:
>-	@${MKDIR} -p ${STAGEDIR}${PYTHON_SITELIBDIR}
>+	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
> 	${INSTALL_LIB} ${BUILD_WRKSRC}/src/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
> 
> .include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 200818: 157677 | 157744 | 158012