Index: head/graphics/openimageio/Makefile =================================================================== --- head/graphics/openimageio/Makefile (revision 561844) +++ head/graphics/openimageio/Makefile (revision 561845) @@ -1,137 +1,137 @@ # Created by: Shane Ambler # $FreeBSD$ PORTNAME= openimageio DISTVERSIONPREFIX= Release- -DISTVERSION= 2.2.9.0 +DISTVERSION= 2.2.10.1 # 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?= 3 +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:graphics/ilmbase \ libIlmImf.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-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+= ${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}${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.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 Index: head/graphics/openimageio/distinfo =================================================================== --- head/graphics/openimageio/distinfo (revision 561844) +++ head/graphics/openimageio/distinfo (revision 561845) @@ -1,3 +1,3 @@ -TIMESTAMP = 1607243801 -SHA256 (OpenImageIO-oiio-Release-2.2.9.0_GH0.tar.gz) = 255cfec0d9e94c8cf412bb2187ca85ad22ed1447342e51f2d439c2e1f8f7b96e -SIZE (OpenImageIO-oiio-Release-2.2.9.0_GH0.tar.gz) = 29216767 +TIMESTAMP = 1610675123 +SHA256 (OpenImageIO-oiio-Release-2.2.10.1_GH0.tar.gz) = 625f4ad666f9aa133039c0ae6ade8fc5dab835fadac988cbe65f824463d614dc +SIZE (OpenImageIO-oiio-Release-2.2.10.1_GH0.tar.gz) = 29215445 Index: head/graphics/openimageio/files/patch-src_webp.imageio_webpinput.cpp =================================================================== --- head/graphics/openimageio/files/patch-src_webp.imageio_webpinput.cpp (revision 561844) +++ head/graphics/openimageio/files/patch-src_webp.imageio_webpinput.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/webp.imageio/webpinput.cpp.orig 2020-12-07 13:21:21 UTC -+++ src/webp.imageio/webpinput.cpp -@@ -136,7 +136,7 @@ WebpInput::open(const std::string& name, ImageSpec& sp - } - - // WebPMuxError err; -- WebPData bitstream { m_encoded_image.get(), m_image_size }; -+ WebPData bitstream { m_encoded_image.get(), (size_t)m_image_size }; - m_demux = WebPDemux(&bitstream); - if (!m_demux) { - errorf("Couldn't decode"); Property changes on: head/graphics/openimageio/files/patch-src_webp.imageio_webpinput.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/openimageio/files/patch-src_cmake_modules_FindOpenJpeg.cmake =================================================================== --- head/graphics/openimageio/files/patch-src_cmake_modules_FindOpenJpeg.cmake (nonexistent) +++ head/graphics/openimageio/files/patch-src_cmake_modules_FindOpenJpeg.cmake (revision 561845) @@ -0,0 +1,32 @@ +--- src/cmake/modules/FindOpenJpeg.cmake.orig 2021-01-17 14:28:27 UTC ++++ src/cmake/modules/FindOpenJpeg.cmake +@@ -56,18 +56,21 @@ endmacro () + + # Generic search paths + set (OpenJpeg_include_paths ++ /usr/local/include/openjpeg-2.4 + /usr/local/include/openjpeg-2.3 + /usr/local/include/openjpeg-2.2 + /usr/local/include/openjpeg-2.1 + /usr/local/include/openjpeg-2.0 + /usr/local/include/openjpeg + /usr/local/include ++ /usr/include/openjpeg-2.4 + /usr/include/openjpeg-2.3 + /usr/include/openjpeg-2.2 + /usr/include/openjpeg-2.1 + /usr/include/openjpeg + /usr/include + /opt/local/include ++ /opt/local/include/openjpeg-2.4 + /opt/local/include/openjpeg-2.3 + /opt/local/include/openjpeg-2.2 + /opt/local/include/openjpeg-2.1 +@@ -88,6 +91,7 @@ if (OpenJpeg_ROOT) + ${OpenJpeg_library_paths} + ) + set (OpenJpeg_include_paths ++ ${OpenJpeg_ROOT}/include/openjpeg-2.4 + ${OpenJpeg_ROOT}/include/openjpeg-2.3 + ${OpenJpeg_ROOT}/include/openjpeg-2.2 + ${OpenJpeg_ROOT}/include/openjpeg-2.1 Property changes on: head/graphics/openimageio/files/patch-src_cmake_modules_FindOpenJpeg.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