Attachment 206510 Details for Bug 239587 – maintainer update for graphics/openimageio

[patch] maintainer update for graphics/openimageio

openimageio.patch (text/plain), 6.26 KB, created by Shane on 2019-08-14 02:47:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2019-08-14 02:47:23 UTC

Size: 6.26 KB

patch

obsolete

>diff -Nru graphics/openimageio.orig/Makefile graphics/openimageio/Makefile
>--- graphics/openimageio.orig/Makefile	2019-08-14 12:16:02.055554000 +0930
>+++ graphics/openimageio/Makefile	2019-08-14 12:15:57.006982000 +0930
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	openimageio
>-PORTVERSION=	1.8.17
> DISTVERSIONPREFIX=	Release-
>-PORTREVISION=	7
>+DISTVERSION=	2.0.10
> CATEGORIES?=	graphics multimedia
> 
> MAINTAINER?=	FreeBSD@Shaneware.biz
>@@ -12,6 +11,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>+BUILD_DEPENDS=	${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map
> LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
> 		libImath.so:graphics/ilmbase \
> 		libIlmImf.so:graphics/openexr \
>@@ -20,7 +20,7 @@
> 		libwebp.so:graphics/webp \
> 		libhdf5.so:science/hdf5
> 
>-USES=		cmake jpeg compiler:c++11-lib
>+USES=		cmake jpeg compiler:c++11-lib iconv:wchar_t
> USE_GITHUB=	yes
> GH_ACCOUNT=	OpenImageIO
> GH_PROJECT=	oiio
>@@ -31,14 +31,18 @@
> CMAKE_ARGS=	USE_CPP:STRING=11
> CMAKE_OFF=	BUILDSTATIC LINKSTATIC NOTHREADS STOP_ON_WARNING USE_OPENSSL
> 
>-OPTIONS_DEFINE=		DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO OPENCV \
>-			OPENJPEG RAW TEST
>-OPTIONS_DEFAULT=	FREETYPE GIF OCIO OPENJPEG
>+OPTIONS_DEFINE=		DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO \
>+			OPENCV OPENJPEG RAW TBB TEST TOOLS VDB
>+OPTIONS_DEFAULT=	DICOM FREETYPE GIF OCIO OPENJPEG
> OPTIONS_SUB=		yes
> 
> DOCS_CMAKE_BOOL=	INSTALL_DOCS
> DOCS_CMAKE_ON=		-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}
> 
>+DICOM_DESC=		DICOM/MEDICOM support
>+DICOM_CMAKE_BOOL=	USE_DICOM
>+DICOM_LIB_DEPENDS=	libdcmimage.so:graphics/dcmtk
>+
> FFMPEG_DESC=		Use FFmpeg to support extra file types
> FFMPEG_CMAKE_BOOL=	USE_FFMPEG
> FFMPEG_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
>@@ -52,6 +56,7 @@
> 
> IMAGEVIEWER_DESC=	Build image viewer (requires Qt)
> IMAGEVIEWER_USES=	qt:5
>+IMAGEVIEWER_IMPLIES=	TOOLS
> IMAGEVIEWER_CMAKE_BOOL=	USE_QT USE_OPENGL
> IMAGEVIEWER_USE=	GL=gl,glu,glew \
> 			QT=buildtools,core,gui,opengl,qmake_build,widgets
>@@ -71,21 +76,33 @@
> RAW_CMAKE_BOOL=		USE_LIBRAW
> RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
> 
>+TBB_DESC=		Intel tbb support
>+TBB_CMAKE_BOOL=		USE_TBB
>+TBB_LIB_DEPENDS=	libtbb.so:devel/tbb
>+
> TEST_CMAKE_BOOL=	OIIO_BUILD_TESTS
> 
>+TOOLS_DESC=		Build CLI tools
>+TOOLS_CMAKE_BOOL=	OIIO_BUILD_TOOLS
>+
>+VDB_DESC=		OpenVDB support
>+VDB_CMAKE_BOOL=		USE_OPENVDB
>+VDB_LIB_DEPENDS=	libopenvdb.so:misc/openvdb
>+
> PLIST_SUB+=		LIBVERS=${PORTVERSION}
> 
> .include <bsd.port.options.mk>
> 
> .if ${SLAVE_PORT} == yes
>-LIB_DEPENDS+=	libOpenImageIO.so:graphics/openimageio \
>-		${PY_BOOST}
>+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
>+LIB_DEPENDS+=	libOpenImageIO.so:graphics/openimageio
> PLIST=		${PKGDIR}/pkg-plist-pybind
> USES+=		python
> USE_PYTHON=	flavors
> CMAKE_ON+=	USE_PYTHON
> CMAKE_OFF+=	OIIO_BUILD_TOOLS USE_FFMPEG
>-CMAKE_ARGS+=	-DPYTHON_VERSION:STRING=${PYTHON_VER}
>+CMAKE_ARGS+=	-DPYTHON_VERSION:STRING=${PYTHON_VER} \
>+		-DPYBIND11_HOME:STRING="${PYTHONPREFIX_INCLUDEDIR}"
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
>@@ -96,10 +113,10 @@
> CMAKE_OFF+=	USE_PYTHON
> 
> post-install:
>-	${LN} -sf libOpenImageIO.so.1.8 \
>-		${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
>-	${LN} -sf libOpenImageIO_Util.so.1.8 \
>-		${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
>+	${LN} -sf libOpenImageIO.so.2.0 \
>+		${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.2
>+	${LN} -sf libOpenImageIO_Util.so.2.0 \
>+		${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.2
> 
> do-test-TEST-on:
> 	@cd ${BUILD_WRKSRC} && ${MAKE_CMD} ARGS=-V test
>diff -Nru graphics/openimageio.orig/distinfo graphics/openimageio/distinfo
>--- graphics/openimageio.orig/distinfo	2019-08-14 12:16:02.072108000 +0930
>+++ graphics/openimageio/distinfo	2019-08-14 10:21:06.758717000 +0930
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1543804503
>-SHA256 (OpenImageIO-oiio-Release-1.8.17_GH0.tar.gz) = a019086c05a6150d445a2240bab1723dff540dde5f5c327c36a97f0b5ae0e157
>-SIZE (OpenImageIO-oiio-Release-1.8.17_GH0.tar.gz) = 27835527
>+TIMESTAMP = 1564901711
>+SHA256 (OpenImageIO-oiio-Release-2.0.10_GH0.tar.gz) = b9c4cb3754cfcf2b03707331c23d5b799a185deccbbc7b8768e0d4e10a535375
>+SIZE (OpenImageIO-oiio-Release-2.0.10_GH0.tar.gz) = 29841455
>diff -Nru graphics/openimageio.orig/pkg-plist graphics/openimageio/pkg-plist
>--- graphics/openimageio.orig/pkg-plist	2019-08-14 12:16:02.022272000 +0930
>+++ graphics/openimageio/pkg-plist	2019-08-14 10:21:06.758819000 +0930
>@@ -1,10 +1,10 @@
>-bin/iconvert
>-bin/idiff
>-bin/igrep
>-bin/iinfo
>+%%TOOLS%%bin/iconvert
>+%%TOOLS%%bin/idiff
>+%%TOOLS%%bin/igrep
>+%%TOOLS%%bin/iinfo
> %%IMAGEVIEWER%%bin/iv
>-bin/maketx
>-bin/oiiotool
>+%%TOOLS%%bin/maketx
>+%%TOOLS%%bin/oiiotool
> include/OpenImageIO/argparse.h
> include/OpenImageIO/array_view.h
> include/OpenImageIO/atomic.h
>@@ -17,6 +17,11 @@
> include/OpenImageIO/filesystem.h
> include/OpenImageIO/filter.h
> include/OpenImageIO/fmath.h
>+include/OpenImageIO/fmt/core.h
>+include/OpenImageIO/fmt/format-inl.h
>+include/OpenImageIO/fmt/format.h
>+include/OpenImageIO/fmt/ostream.h
>+include/OpenImageIO/fmt/printf.h
> include/OpenImageIO/fstream_mingw.h
> include/OpenImageIO/function_view.h
> include/OpenImageIO/hash.h
>@@ -47,6 +52,7 @@
> include/OpenImageIO/sysutil.h
> include/OpenImageIO/texture.h
> include/OpenImageIO/thread.h
>+include/OpenImageIO/tiffutils.h
> include/OpenImageIO/timer.h
> include/OpenImageIO/tinyformat.h
> include/OpenImageIO/typedesc.h
>@@ -56,13 +62,15 @@
> include/OpenImageIO/varyingref.h
> include/OpenImageIO/version.h
> lib/libOpenImageIO.so
>-lib/libOpenImageIO.so.1
>-lib/libOpenImageIO.so.1.8
>+lib/libOpenImageIO.so.2
>+lib/libOpenImageIO.so.2.0
> lib/libOpenImageIO.so.%%LIBVERS%%
> lib/libOpenImageIO_Util.so
>-lib/libOpenImageIO_Util.so.1
>-lib/libOpenImageIO_Util.so.1.8
>+lib/libOpenImageIO_Util.so.2
>+lib/libOpenImageIO_Util.so.2.0
> lib/libOpenImageIO_Util.so.%%LIBVERS%%
>+libdata/pkgconfig/OpenImageIO.pc
>+share/cmake/Modules/FindOpenImageIO.cmake
> %%FREETYPE%%share/fonts/OpenImageIO/DroidSans-Bold.ttf
> %%FREETYPE%%share/fonts/OpenImageIO/DroidSans.ttf
> %%FREETYPE%%share/fonts/OpenImageIO/DroidSansMono.ttf
>@@ -71,5 +79,8 @@
> %%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-Italic.ttf
> %%FREETYPE%%share/fonts/OpenImageIO/DroidSerif.ttf
> %%PORTDOCS%%%%DOCSDIR%%/CHANGES.md
>-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
>+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.x.md
>+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-1.x.md
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE-THIRD-PARTY.md
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
> %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf

Flags:

FreeBSD: maintainer-approval+

Actions: View | Diff

Attachments on bug 239587: 206213 | 206264 | 206510