diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 047b9401446f..f262d2b29ef5 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -1,146 +1,144 @@ PORTNAME= openimageio DISTVERSIONPREFIX= v -DISTVERSION= 2.4.13.0 +DISTVERSION= 2.5.8.0 # PORTREVISION must be set with ?= so as not to stomp over # py-openimageio's PORTREVISION. # Also, just to be on the safe side, when resetting, # best keep PORTREVISION?= 0. -PORTREVISION?= 10 +PORTREVISION?= 0 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz COMMENT?= OpenImageIO graphics library WWW= https://www.openimageio.org/ 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 \ libImath.so:math/Imath \ libOpenColorIO.so:graphics/opencolorio \ libOpenEXR.so:graphics/openexr \ libheif.so:graphics/libheif \ libturbojpeg.so:graphics/libjpeg-turbo \ libpng.so:graphics/png \ libsquish.so:graphics/squish \ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp -USES= cmake jpeg compiler:c++14-lang iconv:wchar_t qt:5 - -USE_QT+= buildtools:build qmake:build +USES= cmake jpeg compiler:c++17-lang iconv:wchar_t USE_GITHUB= yes -GH_ACCOUNT= OpenImageIO -GH_PROJECT= oiio +GH_ACCOUNT= AcademySoftwareFoundation +GH_PROJECT= OpenImageIO +CMAKE_ARGS= -DCMAKE_CXX_STANDARD:INTEGER=17 # OpenVDB uses the C++17 STL +# feature std::tuple_size_v; since the slave port py-openimageio excludes +# options - this is a global line here CMAKE_OFF= BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \ STOP_ON_WARNING USE_OPENSSL OIIO_DOWNLOAD_MISSING_TESTDATA \ USE_Package -CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 # OpenVDB uses the C++17 STL feature std::tuple_size_v; since the slave port py-openimageio excludes options - this is a global line here OPTIONS_DEFINE= DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER \ OPENCV OPENJPEG PTEX RAW TBB TEST TOOLS VDB OPTIONS_DEFAULT= DICOM FREETYPE GIF OPENJPEG PTEX TOOLS VDB 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 +IMAGEVIEWER_USES= gl qt:6 IMAGEVIEWER_IMPLIES= TOOLS -IMAGEVIEWER_CMAKE_BOOL= USE_QT USE_OPENGL -IMAGEVIEWER_USE= GL=gl,glu,glew \ - QT=buildtools,core,gui,opengl,qmake:build,widgets +IMAGEVIEWER_CMAKE_BOOL= USE_OPENGL USE_QT +IMAGEVIEWER_USE= GL=gl,glu,glew QT=base OPENCV_CMAKE_BOOL= USE_OPENCV OPENCV_IMPLIES= OPENJPEG OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \ libopencv_core.so:graphics/opencv 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/onetbb 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= SHL3=${PORTVERSION:R} SHL2=${PORTVERSION:R:R} SHL1=${PORTVERSION:R:R:R} SHL3= ${PORTVERSION:R} SHL2= ${PORTVERSION:R:R} SHL1= ${PORTVERSION:R:R:R} post-patch: @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," \ - ${WRKSRC}/src/cmake/modules/FindPtex.cmake \ - ${WRKSRC}/src/cmake/modules/FindJPEGTurbo.cmake + ${WRKSRC}/src/cmake/modules/FindPtex.cmake .include .if ${SLAVE_PORT} == yes 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 # we don't need the apps built - only libs. CMAKE_OFF+= USE_QT USE_OPENGL OIIO_BUILD_TOOLS OIIO_BUILD_TESTS \ EMBED_PLUGINS CMAKE_ARGS+= -DPYTHON_VERSION:STRING=${PYTHON_VER} do-install: ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO*.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .else # SLAVE_PORT != yes USE_LDCONFIG= yes CMAKE_OFF+= USE_PYTHON post-install: ${LN} -sf libOpenImageIO.so.${SHL3} \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.${SHL2} ${LN} -sf libOpenImageIO.so.${SHL3} \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.${SHL1} ${LN} -sf libOpenImageIO_Util.so.${SHL3} \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.${SHL2} ${LN} -sf libOpenImageIO_Util.so.${SHL3} \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.${SHL1} do-test-TEST-on: @cd ${BUILD_WRKSRC} && ${SETENV} ARGS=-V ${MAKE_CMD} test .endif # SLAVE_PORT .include diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo index 8a355320d328..735fc6e08df2 100644 --- a/graphics/openimageio/distinfo +++ b/graphics/openimageio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690298322 -SHA256 (OpenImageIO-oiio-v2.4.13.0_GH0.tar.gz) = 72b7d2d5edd1049bb7fc09becad4d8be64a9918cdf79bae98b4b32e1fda762cd -SIZE (OpenImageIO-oiio-v2.4.13.0_GH0.tar.gz) = 32162551 +TIMESTAMP = 1708218927 +SHA256 (AcademySoftwareFoundation-OpenImageIO-v2.5.8.0_GH0.tar.gz) = 02e2e6680d7f2862f2e4fca7c17f61ce01833ed343f79d5b1b1720e411d75f76 +SIZE (AcademySoftwareFoundation-OpenImageIO-v2.5.8.0_GH0.tar.gz) = 52043358 diff --git a/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake b/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake deleted file mode 100644 index 5eaeb68d1380..000000000000 --- a/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- src/cmake/modules/FindJPEGTurbo.cmake.orig 2023-01-30 22:36:11 UTC -+++ src/cmake/modules/FindJPEGTurbo.cmake -@@ -9,7 +9,8 @@ find_path(JPEG_INCLUDE_DIR turbojpeg.h - include (FindPackageHandleStandardArgs) - - find_path(JPEG_INCLUDE_DIR turbojpeg.h -- HINTS /usr/local/opt/jpeg-turbo/include -+ HINTS /usr/local -+ %%LOCALBASE%% - PATH_SUFFIXES include) - set(JPEG_NAMES ${JPEG_NAMES} jpeg libjpeg turbojpeg libturbojpeg) - diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist index c2854c55622e..1b159cfef4e7 100644 --- a/graphics/openimageio/pkg-plist +++ b/graphics/openimageio/pkg-plist @@ -1,88 +1,89 @@ %%TOOLS%%bin/iconvert %%TOOLS%%bin/idiff %%TOOLS%%bin/igrep %%TOOLS%%bin/iinfo %%IMAGEVIEWER%%bin/iv %%TOOLS%%bin/maketx %%TOOLS%%bin/oiiotool %%TOOLS%%bin/testtex 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/farmhash.h +include/OpenImageIO/detail/fmt/chrono.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/fmt/std.h include/OpenImageIO/detail/fmt.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/fstream_mingw.h include/OpenImageIO/function_view.h include/OpenImageIO/half.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/Imath.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/refcnt.h include/OpenImageIO/simd.h include/OpenImageIO/span.h include/OpenImageIO/strided_ptr.h include/OpenImageIO/string_view.h include/OpenImageIO/strongparam.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/type_traits.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/vecparam.h include/OpenImageIO/version.h lib/libOpenImageIO.so lib/libOpenImageIO.so.%%SHL1%% lib/libOpenImageIO.so.%%SHL2%% lib/libOpenImageIO.so.%%SHL3%% lib/libOpenImageIO_Util.so lib/libOpenImageIO_Util.so.%%SHL1%% lib/libOpenImageIO_Util.so.%%SHL2%% lib/libOpenImageIO_Util.so.%%SHL3%% libdata/pkgconfig/OpenImageIO.pc lib/cmake/OpenImageIO/OpenImageIOConfig.cmake lib/cmake/OpenImageIO/OpenImageIOConfigVersion.cmake lib/cmake/OpenImageIO/OpenImageIOTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/OpenImageIO/OpenImageIOTargets.cmake %%PORTDOCS%%%%DOCSDIR%%/CHANGES.md %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.x.md %%PORTDOCS%%%%DOCSDIR%%/CHANGES-1.x.md %%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY.md %%PORTDOCS%%%%DOCSDIR%%/LICENSE.md diff --git a/graphics/py-openimageio/Makefile b/graphics/py-openimageio/Makefile index 90cf0342bb59..1e173e9fc75f 100644 --- a/graphics/py-openimageio/Makefile +++ b/graphics/py-openimageio/Makefile @@ -1,10 +1,10 @@ -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= graphics multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= OpenImageIO python bindings MASTERDIR= ${.CURDIR}/../openimageio OPTIONS_EXCLUDE=${OPTIONS_DEFINE} .include "${MASTERDIR}/Makefile"