Attachment 192662 Details for Bug 224382 – maintainer update graphics/openimageio to 1.8.10

[patch] maintainer update graphics/openimageio to 1.8.10

openimageio.patch (text/plain), 10.67 KB, created by Shane on 2018-04-19 19:00:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2018-04-19 19:00:48 UTC

Size: 10.67 KB

patch

obsolete

>diff -Nru graphics/openimageio.orig/distinfo graphics/openimageio/distinfo
>--- graphics/openimageio.orig/distinfo	2018-04-20 04:24:07.819191000 +0930
>+++ graphics/openimageio/distinfo	2018-04-15 11:42:15.160557000 +0930
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1504403179
>-SHA256 (OpenImageIO-oiio-Release-1.7.17_GH0.tar.gz) = 669c59d06399dd882c3e2469bb3a4b33d537db150f6fe056495c3429b5c3838f
>-SIZE (OpenImageIO-oiio-Release-1.7.17_GH0.tar.gz) = 27164765
>+TIMESTAMP = 1523522785
>+SHA256 (OpenImageIO-oiio-Release-1.8.10_GH0.tar.gz) = 9bc86cbc1df67285134bb4ac0ed7a450d52dfe75423577c469cae809a1154665
>+SIZE (OpenImageIO-oiio-Release-1.8.10_GH0.tar.gz) = 27826924
>diff -Nru graphics/openimageio.orig/files/patch-src_cmake_modules_FindOpenCV.cmake graphics/openimageio/files/patch-src_cmake_modules_FindOpenCV.cmake
>--- graphics/openimageio.orig/files/patch-src_cmake_modules_FindOpenCV.cmake	1970-01-01 09:30:00.000000000 +0930
>+++ graphics/openimageio/files/patch-src_cmake_modules_FindOpenCV.cmake	2018-02-07 00:54:13.873096000 +1030
>@@ -0,0 +1,11 @@
>+--- src/cmake/modules/FindOpenCV.cmake.orig	2018-02-02 19:00:47 UTC
>++++ src/cmake/modules/FindOpenCV.cmake
>+@@ -55,7 +55,7 @@ set (opencv_components opencv_imgproc op
>+ if (NOT ${OpenCV_VERSION} VERSION_LESS 3.0.0)
>+     set (opencv_components opencv_videoio ${opencv_components})
>+ else (NOT ${OpenCV_VERSION} VERSION_LESS 3.0.0)
>+-    set (opencv_components opencv_videoio ${opencv_components})
>++    set (opencv_components opencv_highgui ${opencv_components})
>+ endif ()
>+ foreach (component ${opencv_components})
>+     find_library (${component}_lib
>diff -Nru graphics/openimageio.orig/files/patch-src_python_CMakeLists.txt graphics/openimageio/files/patch-src_python_CMakeLists.txt
>--- graphics/openimageio.orig/files/patch-src_python_CMakeLists.txt	1970-01-01 09:30:00.000000000 +0930
>+++ graphics/openimageio/files/patch-src_python_CMakeLists.txt	2018-02-07 00:54:13.873154000 +1030
>@@ -0,0 +1,13 @@
>+--- src/python/CMakeLists.txt.orig	2018-02-04 16:10:49 UTC
>++++ src/python/CMakeLists.txt
>+@@ -16,8 +16,8 @@ find_package (PythonLibs ${PYTHON_VERSIO
>+ if (NOT BOOST_CUSTOM)
>+     # Finding the python component for boost is a little tricky, since it has
>+     # different names on different systems. Try the most common ones.
>+-    foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
>+-             python${PYTHON_VERSION_MAJOR}
>++    foreach (_py_lib python-${PYTHON_VERSION_FOUND}
>++             python${PYTHON_VERSION_MAJOR} python
>+              python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
>+         find_package (Boost QUIET COMPONENTS ${_py_lib})
>+         string (TOUPPER ${_py_lib} _py_lib_name)
>diff -Nru graphics/openimageio.orig/Makefile graphics/openimageio/Makefile
>--- graphics/openimageio.orig/Makefile	2018-04-20 04:24:07.796410000 +0930
>+++ graphics/openimageio/Makefile	2018-04-20 04:23:44.086026000 +0930
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	openimageio
>-PORTVERSION=	1.7.17
>+PORTVERSION=	1.8.10
> DISTVERSIONPREFIX=	Release-
>-PORTREVISION=	9
> CATEGORIES?=	graphics multimedia
> 
> MAINTAINER?=	FreeBSD@Shaneware.biz
>@@ -12,111 +11,97 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
>+# fbm also installs bin/idiff
>+CONFLICTS=	fbm-[0-9]*
>+
>+LIB_DEPENDS+=	libboost_thread.so:devel/boost-libs \
> 		libImath.so:graphics/ilmbase \
> 		libIlmImf.so:graphics/OpenEXR \
>-		libpng.so:graphics/png \
>+		libpng16.so:graphics/png \
> 		libtiff.so:graphics/tiff \
> 		libwebp.so:graphics/webp \
> 		libhdf5.so:science/hdf5
>-
>-# fbm also installs bin/idiff
>-CONFLICTS=	fbm-[0-9]*
>+# on 10.4 clang3.4 fails so we want to use clang50
>+USES=		cmake:outsource compiler:c++14-lang jpeg
>+CMAKE_ARGS=	USE_CPP:STRING=11
>+CMAKE_OFF=	BUILDSTATIC LINKSTATIC NOTHREADS STOP_ON_WARNING USE_OPENSSL
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	OpenImageIO
> GH_PROJECT=	oiio
> 
>-USES=		cmake:outsource jpeg compiler:c++11-lib
>-CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
>-		-DLINKSTATIC:BOOL=OFF \
>-		-DNOTHREADS:BOOL=OFF \
>-		-DSTOP_ON_WARNING:BOOL=OFF \
>-		-DUSE_OPENSSL:BOOL=OFF
>-
> OPTIONS_DEFINE=		DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO OPENCV \
> 			OPENJPEG RAW TEST
> OPTIONS_DEFAULT=	FREETYPE GIF OCIO OPENJPEG
> OPTIONS_SUB=		yes
> 
>-FFMPEG_DESC=		Use FFmpeg to support extra file types
>-IMAGEVIEWER_DESC=	Build image viewer (requires Qt)
>-OCIO_DESC=		Color management support
>+DOCS_CMAKE_BOOL=	INSTALL_DOCS
>+DOCS_CMAKE_ON=		-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}
> 
>-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_DESC=		Use FFmpeg to support extra file types
>+FFMPEG_CMAKE_BOOL=	USE_FFMPEG
> FFMPEG_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
> 
>-FREETYPE_CMAKE_ON=	-DUSE_FREETYPE:BOOL=ON
>-FREETYPE_CMAKE_OFF=	-DUSE_FREETYPE:BOOL=OFF
>+FREETYPE_CMAKE_BOOL=	USE_FREETYPE
>+FREETYPE_CMAKE_ON=	-DFONTS_INSTALL_DIR:STRING=share/fonts/oiio_dev
> FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
> 
>-GIF_CMAKE_ON=		-DUSE_GIF:BOOL=ON
>-GIF_CMAKE_OFF=		-DUSE_GIF:BOOL=OFF
>+GIF_CMAKE_BOOL=		USE_GIF
> GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
> 
>-IMAGEVIEWER_CMAKE_ON=	-DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON
>-IMAGEVIEWER_CMAKE_OFF=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
>+IMAGEVIEWER_DESC=	Build image viewer (requires Qt)
>+IMAGEVIEWER_CMAKE_BOOL=	USE_QT USE_OPENGL
> IMAGEVIEWER_USE=	GL=gl,glu,glew \
>-			QT4=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build
>+			QT5=buildtools,core,gui,opengl,qmake_build,widgets
> 
>-OCIO_CMAKE_ON=		-DUSE_OCIO:BOOL=ON
>-OCIO_CMAKE_OFF=		-DUSE_OCIO:BOOL=OFF
>+OCIO_DESC=		Color management support
>+OCIO_CMAKE_BOOL=	USE_OCIO
> OCIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio
> 
>-OPENCV_CMAKE_ON=	-DUSE_OPENCV:BOOL=ON
>-OPENCV_CMAKE_OFF=	-DUSE_OPENCV:BOOL=OFF
>+OPENCV_CMAKE_BOOL=	USE_OPENCV
> OPENCV_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv \
> 			libopencv_core.so:graphics/opencv-core \
> 			libopenjpeg.so:graphics/openjpeg15
> 
>-OPENJPEG_CMAKE_ON=	-DUSE_OPENJPEG:BOOL=ON
>-OPENJPEG_CMAKE_OFF=	-DUSE_OPENJPEG:BOOL=OFF
>+OPENJPEG_CMAKE_BOOL=	USE_OPENJPEG
> OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
> 
>-RAW_CMAKE_ON=		-DUSE_LIBRAW:BOOL=ON
>-RAW_CMAKE_OFF=		-DUSE_LIBRAW:BOOL=OFF
>+RAW_CMAKE_BOOL=		USE_LIBRAW
> RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
> 
>-TEST_CMAKE_ON=		-DOIIO_BUILD_TESTS:BOOL=ON
>-TEST_CMAKE_OFF=		-DOIIO_BUILD_TESTS:BOOL=OFF
>+TEST_CMAKE_BOOL=	OIIO_BUILD_TESTS
> 
> PLIST_SUB+=		LIBVERS=${PORTVERSION}
> 
> .include <bsd.port.options.mk>
> 
>-.if ${SLAVE_PORT} == no
>-USE_LDCONFIG=	yes
>-CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=OFF -DUSE_PYTHON3:BOOL=OFF \
>-		-DOIIO_BUILD_TOOLS:BOOL=ON
>-.else
>+.if ${SLAVE_PORT} == yes
> LIB_DEPENDS+=	libOpenImageIO.so:graphics/openimageio \
> 		${PY_BOOST}
> PLIST=		${PKGDIR}/pkg-plist-pybind
> USES+=		python
> USE_PYTHON=	flavors
>-CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DUSE_PYTHON3:BOOL=OFF \
>-		-DOIIO_BUILD_TOOLS:BOOL=OFF -DUSE_FFMPEG:BOOL=OFF
>-.endif
>+CMAKE_ON+=	USE_PYTHON
>+CMAKE_OFF+=	OIIO_BUILD_TOOLS USE_FFMPEG
>+CMAKE_ARGS+=	-DPYTHON_VERSION:STRING=${PYTHON_VER}
>+
>+do-install:
>+	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
>+	${INSTALL_LIB} ${BUILD_WRKSRC}/src/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|share/doc/OpenImageIO|${DOCSDIR}|g' \
>-		${WRKSRC}/CMakeLists.txt
>-	${REINPLACE_CMD} -e '/find_/s/ boost_python[[:>:]]/ ${PY_BOOST_LIB}/' \
>-		${WRKSRC}/src/cmake/externalpackages.cmake
>+.else # SLAVE_PORT == no
>+USE_LDCONFIG=	yes
>+CMAKE_ON+=	DOIIO_BUILD_TOOLS
>+CMAKE_OFF+=	USE_PYTHON
> 
> post-install:
>-.if ${SLAVE_PORT} == no
>-	${LN} -sf libOpenImageIO.so.1.7 \
>+	${LN} -sf libOpenImageIO.so.1.8 \
> 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
>-	${LN} -sf libOpenImageIO_Util.so.1.7 \
>+	${LN} -sf libOpenImageIO_Util.so.1.8 \
> 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
>-.endif
> 
> do-test-TEST-on:
> 	@cd ${BUILD_WRKSRC} && ${MAKE_CMD} ARGS=-V test
>+.endif
> 
> .include <bsd.port.mk>
>diff -Nru graphics/openimageio.orig/pkg-plist graphics/openimageio/pkg-plist
>--- graphics/openimageio.orig/pkg-plist	2018-04-20 04:24:07.761798000 +0930
>+++ graphics/openimageio/pkg-plist	2018-02-07 00:54:13.873249000 +1030
>@@ -8,8 +8,8 @@
> include/OpenImageIO/argparse.h
> include/OpenImageIO/array_view.h
> include/OpenImageIO/atomic.h
>+include/OpenImageIO/benchmark.h
> include/OpenImageIO/color.h
>-include/OpenImageIO/coordinate.h
> include/OpenImageIO/dassert.h
> include/OpenImageIO/deepdata.h
> include/OpenImageIO/errorhandler.h
>@@ -18,6 +18,7 @@
> include/OpenImageIO/filter.h
> include/OpenImageIO/fmath.h
> include/OpenImageIO/fstream_mingw.h
>+include/OpenImageIO/function_view.h
> include/OpenImageIO/hash.h
> include/OpenImageIO/image_view.h
> include/OpenImageIO/imagebuf.h
>@@ -29,6 +30,7 @@
> include/OpenImageIO/oiioversion.h
> include/OpenImageIO/optparser.h
> include/OpenImageIO/osdep.h
>+include/OpenImageIO/parallel.h
> include/OpenImageIO/paramlist.h
> include/OpenImageIO/platform.h
> include/OpenImageIO/plugin.h
>@@ -54,19 +56,19 @@
> include/OpenImageIO/version.h
> lib/libOpenImageIO.so
> lib/libOpenImageIO.so.1
>-lib/libOpenImageIO.so.1.7
>+lib/libOpenImageIO.so.1.8
> lib/libOpenImageIO.so.%%LIBVERS%%
> lib/libOpenImageIO_Util.so
> lib/libOpenImageIO_Util.so.1
>-lib/libOpenImageIO_Util.so.1.7
>+lib/libOpenImageIO_Util.so.1.8
> lib/libOpenImageIO_Util.so.%%LIBVERS%%
>-%%FREETYPE%%share/fonts/oiio/DroidSans-Bold.ttf
>-%%FREETYPE%%share/fonts/oiio/DroidSans.ttf
>-%%FREETYPE%%share/fonts/oiio/DroidSansMono.ttf
>-%%FREETYPE%%share/fonts/oiio/DroidSerif-Bold.ttf
>-%%FREETYPE%%share/fonts/oiio/DroidSerif-BoldItalic.ttf
>-%%FREETYPE%%share/fonts/oiio/DroidSerif-Italic.ttf
>-%%FREETYPE%%share/fonts/oiio/DroidSerif.ttf
>+%%FREETYPE%%share/fonts/OpenImageIO/DroidSans-Bold.ttf
>+%%FREETYPE%%share/fonts/OpenImageIO/DroidSans.ttf
>+%%FREETYPE%%share/fonts/OpenImageIO/DroidSansMono.ttf
>+%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-Bold.ttf
>+%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-BoldItalic.ttf
>+%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-Italic.ttf
>+%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif.ttf
> %%PORTDOCS%%%%DOCSDIR%%/CHANGES.md
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE
> %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
>diff -Nru graphics/py-openimageio.orig/Makefile graphics/py-openimageio/Makefile
>--- graphics/py-openimageio.orig/Makefile	2018-04-20 04:28:54.903006000 +0930
>+++ graphics/py-openimageio/Makefile	2017-12-24 00:39:54.797236000 +1030
>@@ -1,17 +1,13 @@
> # Created by: Shane Ambler
> # $FreeBSD$
> 
>-PORTREVISION=	3
> CATEGORIES=	graphics multimedia python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> COMMENT=	OpenImageIO python bindings
> 
> MASTERDIR=	${.CURDIR}/../openimageio
>-OPTIONS_EXCLUDE=${OPTIONS_DEFINE}
>-
>-do-install:
>-	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
>-	${INSTALL_LIB} ${BUILD_WRKSRC}/src/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
>+# we need to use the same options as the main port
>+OPTIONS_NAME=	graphics_openimageio
> 
> .include "${MASTERDIR}/Makefile"

Flags:

FreeBSD: maintainer-approval+

Actions: View | Diff

Attachments on bug 224382: 188884 | 190676 | 192662 | 197038 | 199840 | 199949