From nobody Thu Apr 27 19:12:57 2023 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 4Q6lkL1QSYz47q4B; Thu, 27 Apr 2023 19:12:58 +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 4Q6lkL0y2Pz4CMy; Thu, 27 Apr 2023 19:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682622778; 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=1McU+VxbAFdKQtUCUBqt9wFDWK3qYqmRdu6eKeNEwbw=; b=QXLNGhV/b816IRFFB5g2HdTRO+kBbTwfzU2qVTXAUXk2gTPKmMOQ0rg/YQoF6LCrBjahsd i+nFJ0J6MZLLflcWsRWAOyuXF1SOGJr5bxJs3a2XLbthoIswgFU9UggSMXEpuCMzp/10uP 8CU+gkL3MUbeoyqBZ9KHLZatjIgooSWY32KlVFO8M3QUwGE2BePludPgfdkxbH2LiWCdV2 HdlyZLrwIBAuw0Zb5swcppCl/QVxH0TTXblB0bGxNC+JGruQMX5OLpYRzwGGOs0EWlBirL 7wGUt9LfChmvuH2jjOkhw2YM2peiitIqJw3Z4ljdz1WiO0svxI26GaH2dZjLqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682622778; 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=1McU+VxbAFdKQtUCUBqt9wFDWK3qYqmRdu6eKeNEwbw=; b=DMe0r4qkff0oCSDJ0nt+7Jm3s17qqxrRxdWBKL6XKsxHanHEfKdje0b4V/We3txtg/0WcO NxaJcL6a0rfiR1XI/eUlCucRyi6BBOhIL2ZqQPJAjBmeK3YcuBVrZ3lEdt6F59PhBpHs5m 4pau4mhMbDpPVHzqe3mxJC9R8g9tq9B3JqDYq6Zw3pnA/Nigc0ZX6P5r/U8KiiQy55caL6 zvfqKVkA9WKnT15H9DAzSr1ZMSvi2XbwhLOeCiXGtB4v9ioZU1VsbTN5BkuVDDdKRGxg25 voR7zZoWfol7btBr7IL0NHFILETjTc//EDOsPkbbx4k13ZTiCbHPBd1qTTwCaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682622778; a=rsa-sha256; cv=none; b=osW6B/l2jyrvbIDJhxRpmnpzDrKQ34edfegFMENz3sXA8HvUwmoeVHN9OknbrsDoWSNbSP Q1wTjWqRtf9EZA/bsgPYsNkgK51pP05nUDN0lGJCt4VIYGVjmg22HHLeBbKvHSrymD6swL bkk/xFwvuadKEtT4kUKv3b0NhDYyA1xaNYFgHmZKzWlR+1BAjwbSwPYykrhBZA4kCWZvje 4ONaMj3giLrjD5gpxoDuDYE9BWixjWYOU0M5a1XVeqaI5lQKnOvVMP5wSvCM6dG5iqC8q8 OChzRCNMbnhOmGMFzJjP4zR3K2A2M6Pg77jAqQ6Yk3bv94ck3XyprU33L6NjAg== 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 4Q6lkK70jszVjF; Thu, 27 Apr 2023 19:12:57 +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 33RJCvD7063385; Thu, 27 Apr 2023 19:12:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RJCvRX063384; Thu, 27 Apr 2023 19:12:57 GMT (envelope-from git) Date: Thu, 27 Apr 2023 19:12:57 GMT Message-Id: <202304271912.33RJCvRX063384@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: 65104b4adbbd - main - graphics/openimageio: update to 2.4.10.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: 65104b4adbbdccdacd4e102f6e11dcf6c41443cd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=65104b4adbbdccdacd4e102f6e11dcf6c41443cd commit 65104b4adbbdccdacd4e102f6e11dcf6c41443cd Author: Dima Panov AuthorDate: 2023-04-27 18:36:44 +0000 Commit: Dima Panov CommitDate: 2023-04-27 19:05:17 +0000 graphics/openimageio: update to 2.4.10.0 release (+) Changelog: https://github.com/OpenImageIO/oiio/releases/tag/v2.4.10.0 \ https://github.com/OpenImageIO/oiio/releases/tag/v2.4.9.0 \ https://github.com/OpenImageIO/oiio/releases/tag/v2.4.8.1 \ https://github.com/OpenImageIO/oiio/releases/tag/v2.4.8.0 \ https://github.com/OpenImageIO/oiio/releases/tag/v2.4.7.1 \ https://github.com/OpenImageIO/oiio/releases/tag/v2.4.7.0 \ https://github.com/OpenImageIO/oiio/releases/tag/v2.4.6.0 \ https://github.com/OpenImageIO/oiio/releases/tag/v2.4.5.0 Approved by: maintainer (implicit) --- graphics/openimageio/Makefile | 23 +++++++++++++++------- graphics/openimageio/distinfo | 6 +++--- .../patch-src_cmake_modules_FindJPEGTurbo.cmake | 12 +++++++++++ .../files/patch-src_cmake_modules_FindPtex.cmake | 4 ++-- .../openimageio/files/patch-src_python_py__oiio.h | 4 ++-- graphics/py-openimageio/Makefile | 2 +- 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 5ed848c9d8ca..9cf508bde6cf 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -1,11 +1,11 @@ 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 @@ -18,10 +18,11 @@ 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 \ @@ -36,7 +37,8 @@ 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 @@ -96,11 +98,14 @@ 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 @@ -124,9 +129,13 @@ 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: 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,6 +1,6 @@ ---- 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 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,4 +1,4 @@ -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= graphics multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}