diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 6b7a3a927b74..650b82aae25f 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -1,136 +1,136 @@ # Created by: Shane Ambler PORTNAME= openimageio DISTVERSIONPREFIX= Release- -DISTVERSION= 2.2.13.1 +DISTVERSION= 2.2.16.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?= 5 +PORTREVISION?= 0 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:math/Imath \ libOpenEXR.so:graphics/openexr \ libpng.so:graphics/png \ libsquish.so:graphics/squish \ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp USES= cmake jpeg compiler:c++11-lib iconv:wchar_t USE_GITHUB= yes GH_ACCOUNT= OpenImageIO GH_PROJECT= oiio CMAKE_OFF= BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \ STOP_ON_WARNING USE_OPENSSL OPTIONS_DEFINE= DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO \ 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 \ 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/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 # 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 + @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${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:3.6+ 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 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.2.2 \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.2 ${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 diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo index a6d855710f57..9b8442a05f6d 100644 --- a/graphics/openimageio/distinfo +++ b/graphics/openimageio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618069447 -SHA256 (OpenImageIO-oiio-Release-2.2.13.1_GH0.tar.gz) = 7f810124e866ac14ad9c11b0ab528a6ed4c8e62a190cc44a77eed8159f57405c -SIZE (OpenImageIO-oiio-Release-2.2.13.1_GH0.tar.gz) = 29265740 +TIMESTAMP = 1626457176 +SHA256 (OpenImageIO-oiio-Release-2.2.16.0_GH0.tar.gz) = d1a59f32dbba3ba71ad2e62e107034d1c5287bca1b0696474e927d504cd05ef4 +SIZE (OpenImageIO-oiio-Release-2.2.16.0_GH0.tar.gz) = 29240993 diff --git a/graphics/openimageio/files/patch-src_cmake_modules_FindPTex.cmake b/graphics/openimageio/files/patch-src_cmake_modules_FindPtex.cmake similarity index 70% rename from graphics/openimageio/files/patch-src_cmake_modules_FindPTex.cmake rename to graphics/openimageio/files/patch-src_cmake_modules_FindPtex.cmake index 77bff523c2a0..3666e0a58ebe 100644 --- a/graphics/openimageio/files/patch-src_cmake_modules_FindPTex.cmake +++ b/graphics/openimageio/files/patch-src_cmake_modules_FindPtex.cmake @@ -1,10 +1,10 @@ ---- src/cmake/modules/FindPTex.cmake.orig 2020-05-11 03:43:52 UTC -+++ src/cmake/modules/FindPTex.cmake +--- src/cmake/modules/FindPtex.cmake.orig 2021-07-01 18:54:28 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 diff --git a/graphics/openimageio/files/patch-src_libutil_ustring.cpp b/graphics/openimageio/files/patch-src_libutil_ustring.cpp index 1e71c22a807e..c54dc6a8c78f 100644 --- a/graphics/openimageio/files/patch-src_libutil_ustring.cpp +++ b/graphics/openimageio/files/patch-src_libutil_ustring.cpp @@ -1,20 +1,20 @@ ---- src/libutil/ustring.cpp.orig 2020-01-27 21:27:51 UTC +--- src/libutil/ustring.cpp.orig 2021-07-01 18:54:28 UTC +++ src/libutil/ustring.cpp -@@ -314,7 +314,7 @@ struct libcpp_string__long { +@@ -308,7 +308,7 @@ struct libcpp_string__long { std::string::size_type __size_; std::string::size_type __cap_; }; -# if _LIBCPP_BIG_ENDIAN +# ifdef _LIBCPP_BIG_ENDIAN enum { libcpp_string__long_mask = 0x1ul }; # else // _LIBCPP_BIG_ENDIAN enum { libcpp_string__long_mask = ~(std::string::size_type(~0) >> 1) }; -@@ -325,7 +325,7 @@ struct libcpp_string__long { +@@ -319,7 +319,7 @@ struct libcpp_string__long { std::string::size_type __size_; std::string::pointer __data_; }; -# if _LIBCPP_BIG_ENDIAN +# ifdef _LIBCPP_BIG_ENDIAN enum { libcpp_string__long_mask = ~(std::string::size_type(~0) >> 1) }; # else // _LIBCPP_BIG_ENDIAN enum { libcpp_string__long_mask = 0x1ul }; diff --git a/graphics/py-openimageio/Makefile b/graphics/py-openimageio/Makefile index 895130272631..04c03006263b 100644 --- a/graphics/py-openimageio/Makefile +++ b/graphics/py-openimageio/Makefile @@ -1,12 +1,12 @@ # Created by: Shane Ambler -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"