From nobody Tue Feb 1 17:04:33 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6B53F198BCFA; Tue, 1 Feb 2022 17:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JpB9v0SdYz4pHb; Tue, 1 Feb 2022 17:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643735075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CUwbPS8FQg11jxqtUHdZ1SEpPrmuoLXFp32GL1WREZ0=; b=ZoMjeF0S80bjzhJHyfYpeGVDKJwgU1DyQkf/Uv7cyB7pdled2ay3CR0ODB9Pl91jJE6IJM FsrQuAySIF6xvUO1atfx9xGtA9i5TTycor38DFtakT3y5GWjOTjRTF9aJc3ht21gWNuvpz Sgs8e5tCNcZax7Y4JuKFkmauNVVpn1Es2YeiFPQbjuc3WFI0y22pOincOjCjGtwnjayAcN ey12D/xUCRtJEv8KM7iKefZUmQ9YayBRo3TLXJ79eJn8URQ4qxFPtrbnV4mM3VVs60gHf/ JIaKSvCy0ETIYOx3mwYYcyCqW217z7I6W0Jd3ADA3SuGmkXNXY+5Z/2qEmujOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9751914B8C; Tue, 1 Feb 2022 17:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 211H4Xij086274; Tue, 1 Feb 2022 17:04:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211H4XrM086273; Tue, 1 Feb 2022 17:04:33 GMT (envelope-from git) Date: Tue, 1 Feb 2022 17:04:33 GMT Message-Id: <202202011704.211H4XrM086273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: c7c6e33bbb06 - main - graphics/openimageio: update to 2.3.11.0 release List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7c6e33bbb060b089adbfb730e004f567503252b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643735075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CUwbPS8FQg11jxqtUHdZ1SEpPrmuoLXFp32GL1WREZ0=; b=JmVviu68jGfb+ru5XQm3RGeaUUe/V4We0g8QjdjcuQhxdtOMO7hG3JwUAEgRuqcCAhzY7r w9g+W2pOSlr4Q3lrs7LJ3+bx60QlpQiqk2Ably5eOHpHED5hTrTtmg2kkCSzvr5CKwfX6k 8HyON3K49xtPTooUDjy+S1vviJfhlQW3e3RFPLlR8tRr9jBqnM3mIRqTZ3LY1FdZOJo9v9 U5ty3tb8gqPrpA63gSqzw4W4L7NaeUfKKEB/Qp8i8CfNthCPFeRoHUqoRJBTAPRsuniT01 gR7jVFGPesHZ4WRFZA6kNLD1NO/DgCxf5POJcW7+fU4J4lJtNYJWBUiar92scw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643735075; a=rsa-sha256; cv=none; b=pCtXzcchwkq1nePoQE0imDOnCHYBiVT2cY3DWMa6+TY44iA+TqOxkHHbX15vG3pMp080lY 67uUxhcRz2nG8PjxBl/n+lZnp9aUDrcmurMnuAVQ3SP/jMeU5vEzEGk57SsdCcYdc4R8M0 X0N5GebY8wQFG77xLp/t9xhLuirjnKWZ1+erBBLC6WLGkXEz3kFms/oike0qF/4S21Z0DL a9mqhgIXGgbi6wungOxWk2YC9MCpctt8/wvAPbq23QiKeXCeTwULxSbDZrVmEMhhNXMxE7 RPswruabRieAW/cyS0LTubrrTSZ5N8uVLmSwstv2F3aKl+2dgKBGnsY4RtZUlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c7c6e33bbb060b089adbfb730e004f567503252b commit c7c6e33bbb060b089adbfb730e004f567503252b Author: Dima Panov AuthorDate: 2022-02-01 16:19:11 +0000 Commit: Dima Panov CommitDate: 2022-02-01 17:04:13 +0000 graphics/openimageio: update to 2.3.11.0 release PR: 260307 Sponsored by: Netzkommune GmbH. --- graphics/openimageio/Makefile | 45 +++++++++++----------- graphics/openimageio/distinfo | 6 +-- .../files/patch-src_libutil_ustring.cpp | 20 ---------- graphics/openimageio/pkg-plist | 19 +++++---- 4 files changed, 36 insertions(+), 54 deletions(-) diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index eac80b42ffa6..401e263739eb 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -1,13 +1,11 @@ -# Created by: Shane Ambler - PORTNAME= openimageio -DISTVERSIONPREFIX= Release- -DISTVERSION= 2.2.16.0 +DISTVERSIONPREFIX= v +DISTVERSION= 2.3.11.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 @@ -21,23 +19,27 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libhdf5.so:science/hdf5 \ libheif.so:graphics/libheif \ libImath.so:math/Imath \ + libOpenColorIO.so:graphics/opencolorio \ 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 +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 + STOP_ON_WARNING USE_OPENSSL OIIO_DOWNLOAD_MISSING_TESTDATA -OPTIONS_DEFINE= DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO \ +OPTIONS_DEFINE= DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER \ OPENCV OPENJPEG PTEX RAW TBB TEST TOOLS VDB -OPTIONS_DEFAULT= DICOM FREETYPE GIF OCIO OPENJPEG PTEX TOOLS +OPTIONS_DEFAULT= DICOM FREETYPE GIF OPENJPEG PTEX TOOLS VDB OPTIONS_SUB= yes DOCS_CMAKE_BOOL= INSTALL_DOCS @@ -59,16 +61,12 @@ 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_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 -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 \ @@ -96,9 +94,9 @@ 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/} +PLIST_SUB= SHL3=${PORTVERSION:R} SHL2=${PORTVERSION:R:R} SHL1=${PORTVERSION:R:R:R} +SHL2= ${PORTVERSION:R:R} +SHL1= ${PORTVERSION:R:R:R} post-patch: @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/src/cmake/modules/FindPtex.cmake @@ -109,11 +107,12 @@ post-patch: 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+ +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 +CMAKE_OFF+= USE_QT USE_OPENGL OIIO_BUILD_TOOLS OIIO_BUILD_TESTS \ + EMBED_PLUGINS CMAKE_ARGS+= -DPYTHON_VERSION:STRING=${PYTHON_VER} do-install: @@ -124,10 +123,10 @@ 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 + ${LN} -sf libOpenImageIO.so.${SHL2} \ + ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.${SHL1} + ${LN} -sf libOpenImageIO_Util.so.${SHL2} \ + ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.${SHL1} do-test-TEST-on: @cd ${BUILD_WRKSRC} && ${SETENV} ARGS=-V ${MAKE_CMD} test diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo index 9b8442a05f6d..50ba8f46fb23 100644 --- a/graphics/openimageio/distinfo +++ b/graphics/openimageio/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1642947855 +SHA256 (OpenImageIO-oiio-v2.3.11.0_GH0.tar.gz) = ac43f89d08cdb9661813f9fb809ccb59c211f3913f75d77db5c78e986980f9a4 +SIZE (OpenImageIO-oiio-v2.3.11.0_GH0.tar.gz) = 32439595 diff --git a/graphics/openimageio/files/patch-src_libutil_ustring.cpp b/graphics/openimageio/files/patch-src_libutil_ustring.cpp deleted file mode 100644 index c54dc6a8c78f..000000000000 --- a/graphics/openimageio/files/patch-src_libutil_ustring.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/libutil/ustring.cpp.orig 2021-07-01 18:54:28 UTC -+++ src/libutil/ustring.cpp -@@ -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) }; -@@ -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/openimageio/pkg-plist b/graphics/openimageio/pkg-plist index 6ea3780f713b..a0ccce149d79 100644 --- a/graphics/openimageio/pkg-plist +++ b/graphics/openimageio/pkg-plist @@ -10,6 +10,9 @@ include/OpenImageIO/array_view.h include/OpenImageIO/atomic.h include/OpenImageIO/attrdelegate.h include/OpenImageIO/benchmark.h +include/OpenImageIO/c-deepdata.h +include/OpenImageIO/c-paramlist.h +include/OpenImageIO/c-typedesc.h include/OpenImageIO/color.h include/OpenImageIO/dassert.h include/OpenImageIO/deepdata.h @@ -49,6 +52,7 @@ include/OpenImageIO/simd.h include/OpenImageIO/span.h include/OpenImageIO/strided_ptr.h include/OpenImageIO/string_view.h +include/OpenImageIO/strongparam.h include/OpenImageIO/strutil.h include/OpenImageIO/sysutil.h include/OpenImageIO/texture.h @@ -62,18 +66,17 @@ include/OpenImageIO/ustring.h include/OpenImageIO/varyingref.h include/OpenImageIO/version.h lib/libOpenImageIO.so -lib/libOpenImageIO.so.2 -lib/libOpenImageIO.so.2.2 -lib/libOpenImageIO.so.%%LIBVERS%% +lib/libOpenImageIO.so.%%SHL1%% +lib/libOpenImageIO.so.%%SHL2%% +lib/libOpenImageIO.so.%%SHL3%% lib/libOpenImageIO_Util.so -lib/libOpenImageIO_Util.so.2 -lib/libOpenImageIO_Util.so.2.2 -lib/libOpenImageIO_Util.so.%%LIBVERS%% +lib/libOpenImageIO_Util.so.%%SHL1%% +lib/libOpenImageIO_Util.so.%%SHL2%% +lib/libOpenImageIO_Util.so.%%SHL3%% 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_BUILD_TYPE%%.cmake lib/cmake/OpenImageIO/OpenImageIOTargets.cmake %%PORTDOCS%%%%DOCSDIR%%/CHANGES.md %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.x.md