svn commit: r549390 - in head/graphics/openimageio: . files

Steve Wills swills at FreeBSD.org
Sun Sep 20 20:00:18 UTC 2020 

Author: swills
Date: Sun Sep 20 20:00:17 2020
New Revision: 549390
URL: https://svnweb.freebsd.org/changeset/ports/549390

Log:
  graphics/openimageio: Update to v2.2.6.1
  
  PR:		246861
  Submitted by:	Shane <FreeBSD at ShaneWare.Biz> (maintainer)

Added:
  head/graphics/openimageio/files/patch-src_cmake_modules_FindPTex.cmake   (contents, props changed)
Modified:
  head/graphics/openimageio/Makefile   (contents, props changed)
  head/graphics/openimageio/distinfo   (contents, props changed)
  head/graphics/openimageio/pkg-plist   (contents, props changed)

Modified: head/graphics/openimageio/Makefile
==============================================================================
--- head/graphics/openimageio/Makefile	Sun Sep 20 19:50:57 2020	(r549389)
+++ head/graphics/openimageio/Makefile	Sun Sep 20 20:00:17 2020	(r549390)
@@ -3,8 +3,7 @@
 
 PORTNAME=	openimageio
 DISTVERSIONPREFIX=	Release-
-DISTVERSION=	2.1.15.0
-PORTREVISION=	6
+DISTVERSION=	2.2.6.1
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD at Shaneware.biz
@@ -15,29 +14,26 @@ 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 \
-		libhdf5.so:science/hdf5
+		libwebp.so:graphics/webp
 
 USES=		cmake jpeg compiler:c++11-lib iconv:wchar_t
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageIO
 GH_PROJECT=	oiio
 
-# fbm also installs bin/idiff
-CONFLICTS=	fbm-[0-9]*
-
 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
-OPTIONS_DEFAULT=	DICOM FREETYPE GIF OCIO OPENJPEG TOOLS
+			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
@@ -77,6 +73,9 @@ OPENCV_LIB_DEPENDS=	libopencv_highgui.so:graphics/open
 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
 
@@ -97,17 +96,21 @@ VDB_LIB_DEPENDS=	libopenvdb.so:misc/openvdb
 # 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 <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == yes
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
+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
-CMAKE_ARGS+=	-DPYTHON_VERSION:STRING=${PYTHON_VER} \
-		-DPYBIND11_INCLUDE_DIR:STRING="${PYTHONPREFIX_INCLUDEDIR}"
+# 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}
@@ -117,9 +120,9 @@ USE_LDCONFIG=	yes
 CMAKE_OFF+=	USE_PYTHON
 
 post-install:
-	${LN} -sf libOpenImageIO.so.2.1 \
+	${LN} -sf libOpenImageIO.so.2.2 \
 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.2
-	${LN} -sf libOpenImageIO_Util.so.2.1 \
+	${LN} -sf libOpenImageIO_Util.so.2.2 \
 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.2
 
 do-test-TEST-on:

Modified: head/graphics/openimageio/distinfo
==============================================================================
--- head/graphics/openimageio/distinfo	Sun Sep 20 19:50:57 2020	(r549389)
+++ head/graphics/openimageio/distinfo	Sun Sep 20 20:00:17 2020	(r549390)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1589376603
-SHA256 (OpenImageIO-oiio-Release-2.1.15.0_GH0.tar.gz) = 95b90ba22b73765cbcbd9e11891769c2e78696ad24d4af77ef3f3c8674422401
-SIZE (OpenImageIO-oiio-Release-2.1.15.0_GH0.tar.gz) = 29051047
+TIMESTAMP = 1599280672
+SHA256 (OpenImageIO-oiio-Release-2.2.6.1_GH0.tar.gz) = adc245c9b2fa2bce1dd2decbdd1d03974e1e9818219d267d1da3dd1bd91216df
+SIZE (OpenImageIO-oiio-Release-2.2.6.1_GH0.tar.gz) = 29187970

Added: head/graphics/openimageio/files/patch-src_cmake_modules_FindPTex.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/openimageio/files/patch-src_cmake_modules_FindPTex.cmake	Sun Sep 20 20:00:17 2020	(r549390)
@@ -0,0 +1,10 @@
+--- src/cmake/modules/FindPTex.cmake.orig	2020-05-11 03:43:52 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

Modified: head/graphics/openimageio/pkg-plist
==============================================================================
--- head/graphics/openimageio/pkg-plist	Sun Sep 20 19:50:57 2020	(r549389)
+++ head/graphics/openimageio/pkg-plist	Sun Sep 20 20:00:17 2020	(r549390)
@@ -13,16 +13,19 @@ include/OpenImageIO/benchmark.h
 include/OpenImageIO/color.h
 include/OpenImageIO/dassert.h
 include/OpenImageIO/deepdata.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/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/fmt/core.h
-include/OpenImageIO/fmt/format-inl.h
-include/OpenImageIO/fmt/format.h
-include/OpenImageIO/fmt/ostream.h
-include/OpenImageIO/fmt/printf.h
 include/OpenImageIO/fstream_mingw.h
 include/OpenImageIO/function_view.h
 include/OpenImageIO/hash.h
@@ -39,11 +42,7 @@ include/OpenImageIO/parallel.h
 include/OpenImageIO/paramlist.h
 include/OpenImageIO/platform.h
 include/OpenImageIO/plugin.h
-include/OpenImageIO/pugiconfig.hpp
-include/OpenImageIO/pugixml.cpp
-include/OpenImageIO/pugixml.hpp
 include/OpenImageIO/refcnt.h
-include/OpenImageIO/SHA1.h
 include/OpenImageIO/simd.h
 include/OpenImageIO/span.h
 include/OpenImageIO/strided_ptr.h
@@ -54,7 +53,6 @@ include/OpenImageIO/texture.h
 include/OpenImageIO/thread.h
 include/OpenImageIO/tiffutils.h
 include/OpenImageIO/timer.h
-include/OpenImageIO/tinyformat.h
 include/OpenImageIO/typedesc.h
 include/OpenImageIO/unittest.h
 include/OpenImageIO/unordered_map_concurrent.h
@@ -63,11 +61,11 @@ include/OpenImageIO/varyingref.h
 include/OpenImageIO/version.h
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.2
-lib/libOpenImageIO.so.2.1
+lib/libOpenImageIO.so.2.2
 lib/libOpenImageIO.so.%%LIBVERS%%
 lib/libOpenImageIO_Util.so
 lib/libOpenImageIO_Util.so.2
-lib/libOpenImageIO_Util.so.2.1
+lib/libOpenImageIO_Util.so.2.2
 lib/libOpenImageIO_Util.so.%%LIBVERS%%
 libdata/pkgconfig/OpenImageIO.pc
 share/cmake/Modules/FindOpenImageIO.cmake
@@ -78,5 +76,5 @@ 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%%/THIRD-PARTY.md
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.md

More information about the svn-ports-head mailing list