diff -Nru graphics/openimageio.orig/Makefile graphics/openimageio/Makefile --- graphics/openimageio.orig/Makefile 2020-02-17 21:08:25.122329000 +1030 +++ graphics/openimageio/Makefile 2020-02-17 14:29:43.935905000 +1030 @@ -3,8 +3,7 @@ PORTNAME= openimageio DISTVERSIONPREFIX= Release- -DISTVERSION= 2.0.10 -PORTREVISION= 7 +DISTVERSION= 2.1.11.2 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz @@ -14,9 +13,11 @@ BUILD_DEPENDS= ${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ + 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 @@ -30,7 +31,8 @@ CONFLICTS= fbm-[0-9]* CMAKE_ARGS= USE_CPP:STRING=11 -CMAKE_OFF= BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS STOP_ON_WARNING USE_OPENSSL +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 @@ -90,7 +92,9 @@ VDB_CMAKE_BOOL= USE_OPENVDB VDB_LIB_DEPENDS= libopenvdb.so:misc/openvdb -PLIST_SUB+= LIBVERS=${PORTVERSION} +# 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/} .include @@ -107,16 +111,16 @@ do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} - ${INSTALL_LIB} ${BUILD_WRKSRC}/src/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR} + ${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR} .else # SLAVE_PORT == no USE_LDCONFIG= yes CMAKE_ON+= DOIIO_BUILD_TOOLS CMAKE_OFF+= USE_PYTHON post-install: - ${LN} -sf libOpenImageIO.so.2.0 \ + ${LN} -sf libOpenImageIO.so.2.1 \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.2 - ${LN} -sf libOpenImageIO_Util.so.2.0 \ + ${LN} -sf libOpenImageIO_Util.so.2.1 \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.2 do-test-TEST-on: diff -Nru graphics/openimageio.orig/distinfo graphics/openimageio/distinfo --- graphics/openimageio.orig/distinfo 2020-02-17 21:08:25.122393000 +1030 +++ graphics/openimageio/distinfo 2020-02-16 20:39:48.050248000 +1030 @@ -1,3 +1,3 @@ -TIMESTAMP = 1564901711 -SHA256 (OpenImageIO-oiio-Release-2.0.10_GH0.tar.gz) = b9c4cb3754cfcf2b03707331c23d5b799a185deccbbc7b8768e0d4e10a535375 -SIZE (OpenImageIO-oiio-Release-2.0.10_GH0.tar.gz) = 29841455 +TIMESTAMP = 1581847788 +SHA256 (OpenImageIO-oiio-Release-2.1.11.2_GH0.tar.gz) = 0982f46a6a3107045c06ca825cc1637e023d7e7f16075523a85b10de9acedf55 +SIZE (OpenImageIO-oiio-Release-2.1.11.2_GH0.tar.gz) = 29027505 diff -Nru graphics/openimageio.orig/files/patch-src_libOpenImageIO_CMakeLists.txt graphics/openimageio/files/patch-src_libOpenImageIO_CMakeLists.txt --- graphics/openimageio.orig/files/patch-src_libOpenImageIO_CMakeLists.txt 2020-02-17 21:08:25.122263000 +1030 +++ graphics/openimageio/files/patch-src_libOpenImageIO_CMakeLists.txt 1970-01-01 09:30:00.000000000 +0930 @@ -1,13 +0,0 @@ ---- src/libOpenImageIO/CMakeLists.txt.orig 2016-03-01 22:25:21 UTC -+++ src/libOpenImageIO/CMakeLists.txt -@@ -302,6 +302,10 @@ if (EMBEDPLUGINS) - endif () - endif () - -+if (CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) -+ target_link_libraries (OpenImageIO atomic) -+endif () -+ - target_link_libraries (OpenImageIO ${ILMBASE_LIBRARIES}) - - if (USE_EXTERNAL_PUGIXML) diff -Nru graphics/openimageio.orig/pkg-plist graphics/openimageio/pkg-plist --- graphics/openimageio.orig/pkg-plist 2020-02-17 21:08:25.106726000 +1030 +++ graphics/openimageio/pkg-plist 2020-02-06 20:13:47.203392000 +1030 @@ -8,6 +8,7 @@ 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 @@ -34,7 +35,6 @@ include/OpenImageIO/missing_math.h include/OpenImageIO/oiioversion.h include/OpenImageIO/optparser.h -include/OpenImageIO/osdep.h include/OpenImageIO/parallel.h include/OpenImageIO/paramlist.h include/OpenImageIO/platform.h @@ -63,17 +63,20 @@ include/OpenImageIO/version.h lib/libOpenImageIO.so lib/libOpenImageIO.so.2 -lib/libOpenImageIO.so.2.0 +lib/libOpenImageIO.so.2.1 lib/libOpenImageIO.so.%%LIBVERS%% lib/libOpenImageIO_Util.so lib/libOpenImageIO_Util.so.2 -lib/libOpenImageIO_Util.so.2.0 +lib/libOpenImageIO_Util.so.2.1 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%%/LICENSE.md -%%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf