Index: head/graphics/openimageio/Makefile =================================================================== --- head/graphics/openimageio/Makefile (revision 549389) +++ head/graphics/openimageio/Makefile (revision 549390) @@ -1,129 +1,132 @@ # Created by: Shane Ambler # $FreeBSD$ PORTNAME= openimageio DISTVERSIONPREFIX= Release- -DISTVERSION= 2.1.15.0 -PORTREVISION= 6 +DISTVERSION= 2.2.6.1 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz COMMENT?= OpenImageIO graphics library LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libfmt.so:devel/libfmt \ + libhdf5.so:science/hdf5 \ libheif.so:graphics/libheif \ libImath.so:graphics/ilmbase \ libIlmImf.so:graphics/openexr \ libpng.so:graphics/png \ libsquish.so:graphics/squish \ libtiff.so:graphics/tiff \ - libwebp.so:graphics/webp \ - libhdf5.so:science/hdf5 + libwebp.so:graphics/webp USES= cmake jpeg compiler:c++11-lib iconv:wchar_t USE_GITHUB= yes GH_ACCOUNT= OpenImageIO GH_PROJECT= oiio -# fbm also installs bin/idiff -CONFLICTS= fbm-[0-9]* - CMAKE_OFF= BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \ STOP_ON_WARNING USE_OPENSSL OPTIONS_DEFINE= DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO \ - OPENCV OPENJPEG RAW TBB TEST TOOLS VDB -OPTIONS_DEFAULT= DICOM FREETYPE GIF OCIO OPENJPEG TOOLS + OPENCV OPENJPEG PTEX RAW TBB TEST TOOLS VDB +OPTIONS_DEFAULT= DICOM FREETYPE GIF OCIO OPENJPEG PTEX TOOLS 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 FREETYPE_CMAKE_BOOL= USE_FREETYPE FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_RUN_DEPENDS= ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf GIF_CMAKE_BOOL= USE_GIF GIF_LIB_DEPENDS= libgif.so:graphics/giflib IMAGEVIEWER_DESC= Build image viewer (requires Qt) IMAGEVIEWER_USES= gl 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 OCIO_DESC= Color management support OCIO_CMAKE_BOOL= USE_OCIO OCIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio 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_BOOL= USE_OPENJPEG OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg +PTEX_DESC= ptex support +PTEX_LIB_DEPENDS= libPtex.so:graphics/ptex + 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 # DISTVERSION has an extra digit which isn't in the lib name # for LIBVERS we want the first three digits PLIST_SUB+= LIBVERS=${DISTVERSION:C/([0-9]*)\.([0-9]*)\.([0-9]*)(.*)/\1.\2.\3/} +post-patch: + @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/src/cmake/modules/FindPTex.cmake + .include .if ${SLAVE_PORT} == yes -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} +BUILD_DEPENDS+= ${PREFIX}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11 LIB_DEPENDS+= libOpenImageIO.so:graphics/openimageio PLIST= ${PKGDIR}/pkg-plist-pybind USES+= python USE_PYTHON= flavors CMAKE_ON+= USE_PYTHON -CMAKE_ARGS+= -DPYTHON_VERSION:STRING=${PYTHON_VER} \ - -DPYBIND11_INCLUDE_DIR:STRING="${PYTHONPREFIX_INCLUDEDIR}" +# we don't need the apps built - only libs. +CMAKE_OFF+= USE_QT USE_OPENGL OIIO_BUILD_TOOLS OIIO_BUILD_TESTS +CMAKE_ARGS+= -DPYTHON_VERSION:STRING=${PYTHON_VER} do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR} .else # SLAVE_PORT != yes USE_LDCONFIG= yes CMAKE_OFF+= USE_PYTHON post-install: - ${LN} -sf libOpenImageIO.so.2.1 \ + ${LN} -sf libOpenImageIO.so.2.2 \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.2 - ${LN} -sf libOpenImageIO_Util.so.2.1 \ + ${LN} -sf libOpenImageIO_Util.so.2.2 \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.2 do-test-TEST-on: @cd ${BUILD_WRKSRC} && ${SETENV} ARGS=-V ${MAKE_CMD} test .endif # SLAVE_PORT .include Index: head/graphics/openimageio/distinfo =================================================================== --- head/graphics/openimageio/distinfo (revision 549389) +++ head/graphics/openimageio/distinfo (revision 549390) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589376603 -SHA256 (OpenImageIO-oiio-Release-2.1.15.0_GH0.tar.gz) = 95b90ba22b73765cbcbd9e11891769c2e78696ad24d4af77ef3f3c8674422401 -SIZE (OpenImageIO-oiio-Release-2.1.15.0_GH0.tar.gz) = 29051047 +TIMESTAMP = 1599280672 +SHA256 (OpenImageIO-oiio-Release-2.2.6.1_GH0.tar.gz) = adc245c9b2fa2bce1dd2decbdd1d03974e1e9818219d267d1da3dd1bd91216df +SIZE (OpenImageIO-oiio-Release-2.2.6.1_GH0.tar.gz) = 29187970 Index: head/graphics/openimageio/files/patch-src_cmake_modules_FindPTex.cmake =================================================================== --- head/graphics/openimageio/files/patch-src_cmake_modules_FindPTex.cmake (nonexistent) +++ head/graphics/openimageio/files/patch-src_cmake_modules_FindPTex.cmake (revision 549390) @@ -0,0 +1,10 @@ +--- src/cmake/modules/FindPTex.cmake.orig 2020-05-11 03:43:52 UTC ++++ src/cmake/modules/FindPTex.cmake +@@ -70,6 +70,7 @@ else () + PATHS + /usr/include + /usr/local/include ++ %%LOCALBASE%%/include/ptex + DOC "The directory where Ptexture.h resides") + find_library( PTEX_LIBRARY + NAMES Property changes on: head/graphics/openimageio/files/patch-src_cmake_modules_FindPTex.cmake ___________________________________________________________________ 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 549389) +++ head/graphics/openimageio/pkg-plist (revision 549390) @@ -1,82 +1,80 @@ %%TOOLS%%bin/iconvert %%TOOLS%%bin/idiff %%TOOLS%%bin/igrep %%TOOLS%%bin/iinfo %%IMAGEVIEWER%%bin/iv %%TOOLS%%bin/maketx %%TOOLS%%bin/oiiotool include/OpenImageIO/argparse.h include/OpenImageIO/array_view.h include/OpenImageIO/atomic.h include/OpenImageIO/attrdelegate.h include/OpenImageIO/benchmark.h include/OpenImageIO/color.h include/OpenImageIO/dassert.h include/OpenImageIO/deepdata.h +include/OpenImageIO/detail/fmt/core.h +include/OpenImageIO/detail/fmt/format-inl.h +include/OpenImageIO/detail/fmt/format.h +include/OpenImageIO/detail/fmt/ostream.h +include/OpenImageIO/detail/fmt/printf.h +include/OpenImageIO/detail/pugixml/pugiconfig.hpp +include/OpenImageIO/detail/pugixml/pugixml.cpp +include/OpenImageIO/detail/pugixml/pugixml.hpp include/OpenImageIO/errorhandler.h include/OpenImageIO/export.h 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 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/parallel.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/span.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/tiffutils.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.2 -lib/libOpenImageIO.so.2.1 +lib/libOpenImageIO.so.2.2 lib/libOpenImageIO.so.%%LIBVERS%% lib/libOpenImageIO_Util.so lib/libOpenImageIO_Util.so.2 -lib/libOpenImageIO_Util.so.2.1 +lib/libOpenImageIO_Util.so.2.2 lib/libOpenImageIO_Util.so.%%LIBVERS%% libdata/pkgconfig/OpenImageIO.pc share/cmake/Modules/FindOpenImageIO.cmake lib/cmake/OpenImageIO/OpenImageIOConfig.cmake lib/cmake/OpenImageIO/OpenImageIOConfigVersion.cmake lib/cmake/OpenImageIO/OpenImageIOTargets-release.cmake lib/cmake/OpenImageIO/OpenImageIOTargets.cmake %%PORTDOCS%%%%DOCSDIR%%/CHANGES.md %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.x.md %%PORTDOCS%%%%DOCSDIR%%/CHANGES-1.x.md -%%PORTDOCS%%%%DOCSDIR%%/LICENSE-THIRD-PARTY.md +%%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY.md %%PORTDOCS%%%%DOCSDIR%%/LICENSE.md