Index: head/graphics/blender/files/patch-source_blender_imbuf_intern_oiio_openimageio__api.cpp =================================================================== --- head/graphics/blender/files/patch-source_blender_imbuf_intern_oiio_openimageio__api.cpp (nonexistent) +++ head/graphics/blender/files/patch-source_blender_imbuf_intern_oiio_openimageio__api.cpp (revision 445627) @@ -0,0 +1,21 @@ +--- source/blender/imbuf/intern/oiio/openimageio_api.cpp.orig 2017-02-13 14:08:03 UTC ++++ source/blender/imbuf/intern/oiio/openimageio_api.cpp +@@ -35,6 +35,9 @@ + #include "utfconv.h" + #endif + ++#include ++#include ++ + extern "C" + { + #include "MEM_guardedalloc.h" +@@ -48,8 +51,6 @@ extern "C" + #include "IMB_colormanagement_intern.h" + } + +-#include +-#include + + OIIO_NAMESPACE_USING + Property changes on: head/graphics/blender/files/patch-source_blender_imbuf_intern_oiio_openimageio__api.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/openimageio/Makefile =================================================================== --- head/graphics/openimageio/Makefile (revision 445626) +++ head/graphics/openimageio/Makefile (revision 445627) @@ -1,119 +1,119 @@ # Created by: Shane Ambler # $FreeBSD$ PORTNAME= openimageio -PORTVERSION= 1.6.12 +PORTVERSION= 1.7.10 DISTVERSIONPREFIX= Release- -PORTREVISION= 13 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz COMMENT?= OpenImageIO graphics library LICENSE= BSD3CLAUSE -USE_GITHUB= yes -GH_ACCOUNT= OpenImageIO -GH_PROJECT= oiio +LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ + libImath.so:graphics/ilmbase \ + libIlmImf.so:graphics/OpenEXR \ + 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]* -USES= cmake:outsource compiler:c11 +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 \ - -DOIIO_BUILD_CPP11:BOOL=OFF \ - -DOIIO_BUILD_CPP14: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_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:multimedia/ffmpeg FREETYPE_CMAKE_ON= -DUSE_FREETYPE:BOOL=ON FREETYPE_CMAKE_OFF= -DUSE_FREETYPE:BOOL=OFF FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 GIF_CMAKE_ON= -DUSE_GIF:BOOL=ON GIF_CMAKE_OFF= -DUSE_GIF:BOOL=OFF 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_USE= GL=glew QT4=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build +IMAGEVIEWER_USE= GL=gl,glu,glew \ + QT4=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build OCIO_CMAKE_ON= -DUSE_OCIO:BOOL=ON OCIO_CMAKE_OFF= -DUSE_OCIO:BOOL=OFF OCIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio OPENCV_CMAKE_ON= -DUSE_OPENCV:BOOL=ON OPENCV_CMAKE_OFF= -DUSE_OPENCV:BOOL=OFF -OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv +OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \ + libopencv_core.so:graphics/opencv2-core \ + libopenjpeg.so:graphics/openjpeg15 OPENJPEG_CMAKE_ON= -DUSE_OPENJPEG:BOOL=ON OPENJPEG_CMAKE_OFF= -DUSE_OPENJPEG:BOOL=OFF -OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 +OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg RAW_CMAKE_ON= -DUSE_LIBRAW:BOOL=ON RAW_CMAKE_OFF= -DUSE_LIBRAW:BOOL=OFF RAW_LIB_DEPENDS= libraw_r.so:graphics/libraw TEST_CMAKE_ON= -DOIIO_BUILD_TESTS:BOOL=ON TEST_CMAKE_OFF= -DOIIO_BUILD_TESTS:BOOL=OFF PLIST_SUB+= LIBVERS=${PORTVERSION} .include -.if ${ARCH} == powerpc -USE_GCC= yes -.endif - .if ${SLAVE_PORT} == no -LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR \ - libboost_thread.so:devel/boost-libs \ - libhdf5.so:science/hdf5 \ - libwebp.so:graphics/webp USE_LDCONFIG= yes CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF -DUSE_PYTHON3:BOOL=OFF \ -DOIIO_BUILD_TOOLS:BOOL=ON .else -LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio \ +LIB_DEPENDS+= libOpenImageIO.so:graphics/openimageio \ libboost_python.so:devel/boost-python-libs PLIST= ${PKGDIR}/pkg-plist-pybind #while oiio supports py3, ports doesn't have py3 support for boost-python yet USES+= python:2 CMAKE_ARGS+= -DUSE_PYTHON:BOOL=ON -DUSE_PYTHON3:BOOL=OFF \ -DOIIO_BUILD_TOOLS:BOOL=OFF -DUSE_FFMPEG: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.6 \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1 ${LN} -sf libOpenImageIO_Util.so.1.6 \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1 .endif do-test-TEST-on: @cd ${BUILD_WRKSRC} && ${MAKE_CMD} ARGS=-V test .include Index: head/graphics/openimageio/distinfo =================================================================== --- head/graphics/openimageio/distinfo (revision 445626) +++ head/graphics/openimageio/distinfo (revision 445627) @@ -1,2 +1,3 @@ -SHA256 (OpenImageIO-oiio-Release-1.6.12_GH0.tar.gz) = 14b2221e1f45723fecc1def7863bad8839ef459147242d87c16651246d41a945 -SIZE (OpenImageIO-oiio-Release-1.6.12_GH0.tar.gz) = 24919192 +TIMESTAMP = 1484843803 +SHA256 (OpenImageIO-oiio-Release-1.7.10_GH0.tar.gz) = ec5c567b6b4078d17df22262b764ebb7c09ce5b69f0bc2095b51e56c7070f5b7 +SIZE (OpenImageIO-oiio-Release-1.7.10_GH0.tar.gz) = 26188475 Index: head/graphics/openimageio/pkg-plist =================================================================== --- head/graphics/openimageio/pkg-plist (revision 445626) +++ head/graphics/openimageio/pkg-plist (revision 445627) @@ -1,70 +1,72 @@ bin/iconvert bin/idiff bin/igrep bin/iinfo %%IMAGEVIEWER%%bin/iv bin/maketx bin/oiiotool include/OpenImageIO/argparse.h include/OpenImageIO/array_view.h +include/OpenImageIO/atomic.h include/OpenImageIO/color.h include/OpenImageIO/coordinate.h include/OpenImageIO/dassert.h +include/OpenImageIO/deepdata.h include/OpenImageIO/errorhandler.h include/OpenImageIO/export.h include/OpenImageIO/filesystem.h include/OpenImageIO/filter.h include/OpenImageIO/fmath.h include/OpenImageIO/fstream_mingw.h include/OpenImageIO/hash.h include/OpenImageIO/image_view.h include/OpenImageIO/imagebuf.h include/OpenImageIO/imagebufalgo_util.h 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 include/OpenImageIO/paramlist.h include/OpenImageIO/platform.h include/OpenImageIO/plugin.h include/OpenImageIO/pugiconfig.hpp include/OpenImageIO/pugixml.cpp include/OpenImageIO/pugixml.hpp include/OpenImageIO/refcnt.h include/OpenImageIO/SHA1.h include/OpenImageIO/simd.h include/OpenImageIO/strided_ptr.h include/OpenImageIO/string_view.h include/OpenImageIO/strutil.h include/OpenImageIO/sysutil.h include/OpenImageIO/texture.h include/OpenImageIO/thread.h include/OpenImageIO/timer.h include/OpenImageIO/tinyformat.h include/OpenImageIO/typedesc.h include/OpenImageIO/unittest.h include/OpenImageIO/unordered_map_concurrent.h include/OpenImageIO/ustring.h include/OpenImageIO/varyingref.h include/OpenImageIO/version.h lib/libOpenImageIO.so lib/libOpenImageIO.so.1 -lib/libOpenImageIO.so.1.6 +lib/libOpenImageIO.so.1.7 lib/libOpenImageIO.so.%%LIBVERS%% lib/libOpenImageIO_Util.so lib/libOpenImageIO_Util.so.1 -lib/libOpenImageIO_Util.so.1.6 +lib/libOpenImageIO_Util.so.1.7 lib/libOpenImageIO_Util.so.%%LIBVERS%% -share/fonts/oiio/DroidSans-Bold.ttf -share/fonts/oiio/DroidSans.ttf -share/fonts/oiio/DroidSansMono.ttf -share/fonts/oiio/DroidSerif-Bold.ttf -share/fonts/oiio/DroidSerif-BoldItalic.ttf -share/fonts/oiio/DroidSerif-Italic.ttf -share/fonts/oiio/DroidSerif.ttf -%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%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 +%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf