Index: head/graphics/openimageio/Makefile =================================================================== --- head/graphics/openimageio/Makefile (revision 391570) +++ head/graphics/openimageio/Makefile (revision 391571) @@ -1,83 +1,104 @@ # Created by: Shane Ambler # $FreeBSD$ PORTNAME= openimageio -PORTVERSION= 1.4.15 +PORTVERSION= 1.5.16 DISTVERSIONPREFIX= Release- -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz COMMENT?= OpenImageIO graphics library LICENSE= BSD3CLAUSE USE_GITHUB= yes GH_ACCOUNT= OpenImageIO GH_PROJECT= oiio # fbm also installs bin/idiff CONFLICTS= fbm-[0-9]* 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 IMAGEVIEWER_DESC= Build image viewer OCIO_DESC= Colour 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:${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 .if ${SLAVE_PORT} == no -LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ +LIB_DEPENDS+= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libhdf5.so:${PORTSDIR}/science/hdf5 \ libopencv_legacy.so:${PORTSDIR}/graphics/opencv \ libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \ libwebp.so:${PORTSDIR}/graphics/webp USE_LDCONFIG= yes -CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF -DOIIO_BUILD_TOOLS:BOOL=ON +CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF -DUSE_PYTHON3:BOOL=OFF \ + -DOIIO_BUILD_TOOLS:BOOL=ON .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 -DUSE_PYTHON3:BOOL=OFF \ + -DOIIO_BUILD_TOOLS:BOOL=OFF .endif .if ${PORT_OPTIONS:MIMAGEVIEWER} USE_GL= glew USE_QT4= corelib gui opengl qmake_build moc_build rcc_build uic_build CMAKE_ARGS+= -DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON CMAKE_ENV+= QTDIR=${QT_PREFIX} QT_INCLUDES=${QT_INCDIR} .else CMAKE_ARGS+= -DUSE_OPENGL:BOOL=OFF -DUSE_QT: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.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 Index: head/graphics/openimageio/distinfo =================================================================== --- head/graphics/openimageio/distinfo (revision 391570) +++ head/graphics/openimageio/distinfo (revision 391571) @@ -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 Index: head/graphics/openimageio/files/patch-src_include_OpenImageIO_simd.h =================================================================== --- head/graphics/openimageio/files/patch-src_include_OpenImageIO_simd.h (nonexistent) +++ head/graphics/openimageio/files/patch-src_include_OpenImageIO_simd.h (revision 391571) @@ -0,0 +1,15 @@ +--- src/include/OpenImageIO/simd.h.orig 2015-06-23 11:59:51 UTC ++++ src/include/OpenImageIO/simd.h +@@ -52,8 +52,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + #if (defined(__SSE2__) || (_MSC_VER >= 1300 && !_M_CEE_PURE)) && !defined(OIIO_NO_SSE) + # include + # include +-# if defined(__SSE3__) || defined(__SSSE3__) ++# if defined(__SSE3__) + # include ++# endif ++# if defined(__SSSE3__) + # include + # endif + # if (defined(__SSE4_1__) || defined(__SSE4_2__)) + Property changes on: head/graphics/openimageio/files/patch-src_include_OpenImageIO_simd.h ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/graphics/openimageio/pkg-plist (revision 391570) +++ head/graphics/openimageio/pkg-plist (revision 391571) @@ -1,60 +1,62 @@ 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/color.h include/OpenImageIO/dassert.h include/OpenImageIO/errorhandler.h include/OpenImageIO/export.h include/OpenImageIO/filesystem.h include/OpenImageIO/filter.h include/OpenImageIO/fmath.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_ref.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.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