diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 5ed848c9d8ca..9cf508bde6cf 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -1,136 +1,145 @@ PORTNAME= openimageio DISTVERSIONPREFIX= v -DISTVERSION= 2.4.4.2 +DISTVERSION= 2.4.10.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 \ - libheif.so:graphics/libheif \ 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 USE_GITHUB= yes GH_ACCOUNT= OpenImageIO GH_PROJECT= oiio CMAKE_OFF= BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \ - STOP_ON_WARNING USE_OPENSSL OIIO_DOWNLOAD_MISSING_TESTDATA + STOP_ON_WARNING USE_OPENSSL OIIO_DOWNLOAD_MISSING_TESTDATA \ + USE_Package 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_IMPLIES= TOOLS IMAGEVIEWER_CMAKE_BOOL= USE_QT USE_OPENGL IMAGEVIEWER_USE= GL=gl,glu,glew \ QT=buildtools,core,gui,opengl,qmake:build,widgets 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 + @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," \ + ${WRKSRC}/src/cmake/modules/FindPtex.cmake \ + ${WRKSRC}/src/cmake/modules/FindJPEGTurbo.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.${SHL2} \ + ${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.${SHL2} \ + ${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 9792a5fc13b6..5ba4c8fc7dfa 100644 --- a/graphics/openimageio/distinfo +++ b/graphics/openimageio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665071359 -SHA256 (OpenImageIO-oiio-v2.4.4.2_GH0.tar.gz) = 1ae437e1178f53a972d8b42147d7571c5463652a638b36526f25d5719becbb55 -SIZE (OpenImageIO-oiio-v2.4.4.2_GH0.tar.gz) = 31883775 +TIMESTAMP = 1681123075 +SHA256 (OpenImageIO-oiio-v2.4.10.0_GH0.tar.gz) = 59f523a0b9a1014993bedcf7752993af43b348761165f52ea6eb84787f57aed5 +SIZE (OpenImageIO-oiio-v2.4.10.0_GH0.tar.gz) = 32155954 diff --git a/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake b/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake new file mode 100644 index 000000000000..5eaeb68d1380 --- /dev/null +++ b/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake @@ -0,0 +1,12 @@ +--- 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/files/patch-src_cmake_modules_FindPtex.cmake b/graphics/openimageio/files/patch-src_cmake_modules_FindPtex.cmake index 3666e0a58ebe..489030783015 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 2021-07-01 18:54:28 UTC +--- src/cmake/modules/FindPtex.cmake.orig 2023-01-30 22:36:11 UTC +++ src/cmake/modules/FindPtex.cmake @@ -70,6 +70,7 @@ else () PATHS /usr/include /usr/local/include -+ %%LOCALBASE%%/include/ptex ++ /usr/local/include/ptex DOC "The directory where Ptexture.h resides") find_library( PTEX_LIBRARY NAMES diff --git a/graphics/openimageio/files/patch-src_python_py__oiio.h b/graphics/openimageio/files/patch-src_python_py__oiio.h index c46019870a19..5f578905aff1 100644 --- a/graphics/openimageio/files/patch-src_python_py__oiio.h +++ b/graphics/openimageio/files/patch-src_python_py__oiio.h @@ -1,16 +1,16 @@ ---- src/python/py_oiio.h.orig 2022-02-27 08:12:20 UTC +--- src/python/py_oiio.h.orig 2023-01-30 22:36:11 UTC +++ src/python/py_oiio.h -@@ -41,6 +41,13 @@ OIIO_CLANG_PRAGMA(GCC diagnostic ignored "-Wunused-val +@@ -42,6 +42,13 @@ OIIO_CLANG_PRAGMA(GCC diagnostic ignored "-Wunused-val OIIO_CLANG_PRAGMA(GCC diagnostic ignored "-Wunused-value") #endif +#if PY_VERSION_HEX >= 0x030b00a6 + #ifndef Py_BUILD_CORE + #define Py_BUILD_CORE 1 + #endif + #include "internal/pycore_frame.h" +#endif + #include #include #include diff --git a/graphics/py-openimageio/Makefile b/graphics/py-openimageio/Makefile index d526fe4351c8..1e173e9fc75f 100644 --- a/graphics/py-openimageio/Makefile +++ b/graphics/py-openimageio/Makefile @@ -1,10 +1,10 @@ -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= graphics multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= OpenImageIO python bindings MASTERDIR= ${.CURDIR}/../openimageio OPTIONS_EXCLUDE=${OPTIONS_DEFINE} .include "${MASTERDIR}/Makefile"