git: 175bbab74c9b - main - graphics/openexr*: upgrade to 3.3.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 13 Oct 2024 15:22:54 UTC
The branch main has been updated by mandree:
URL: https://cgit.FreeBSD.org/ports/commit/?id=175bbab74c9bbd704b5e51da55355afc91c79b4b
commit 175bbab74c9bbd704b5e51da55355afc91c79b4b
Author: Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2024-10-02 20:50:41 +0000
Commit: Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2024-10-13 13:54:20 +0000
graphics/openexr*: upgrade to 3.3.0
This changes the ABI (but not the API) and .so file name,
so we will need to bump all PORTREVISIONs of users, and we'll also fix
graphics/ctl and multimedia/olive.
This is not going to be MFHd to 2024Q4 due to API change, and therefore
has also waited for 2024Q4 to branch before we committed this to main,
so as to avoid 2024Q4 breakage.
ChangeLog: https://github.com/AcademySoftwareFoundation/openexr/releases/tag/v3.3.0
PR: 281859
---
graphics/openexr-website-docs/Makefile | 2 ++
graphics/openexr-website-docs/distinfo | 8 +++---
.../files/patch-CMakeLists.txt | 10 +++----
.../files/patch-website_news.rst | 11 --------
.../files/patch-website_scripts_test__images.py | 31 ----------------------
graphics/openexr/Makefile | 9 +++----
graphics/openexr/distinfo | 6 ++---
graphics/openexr/pkg-plist | 5 ++++
8 files changed, 24 insertions(+), 58 deletions(-)
diff --git a/graphics/openexr-website-docs/Makefile b/graphics/openexr-website-docs/Makefile
index 17bbe66a8ef3..6cc631aa83fc 100644
--- a/graphics/openexr-website-docs/Makefile
+++ b/graphics/openexr-website-docs/Makefile
@@ -23,6 +23,7 @@ DISTFILES+= ScanLines/README.rst:website
DISTFILES+= ScanLines/Blobbies.exr:website
DISTFILES+= ScanLines/CandleGlass.exr:website
DISTFILES+= ScanLines/Cannon.exr:website
+DISTFILES+= ScanLines/Carrots.exr:website
DISTFILES+= ScanLines/Desk.exr:website
DISTFILES+= ScanLines/MtTamWest.exr:website
DISTFILES+= ScanLines/PrismsLenses.exr:website
@@ -129,6 +130,7 @@ ALL_TARGET= website
MASTERDIR= ${.CURDIR}/../../graphics/openexr
PATCHDIR= ${.CURDIR}/files
PKGDIR= ${.CURDIR}
+WRKSRC= ${WRKDIR}/openexr-${PORTVERSION}
BINARY_ALIAS= python3=${PYTHON_CMD}
diff --git a/graphics/openexr-website-docs/distinfo b/graphics/openexr-website-docs/distinfo
index eae56834d530..9b16c6be1dbc 100644
--- a/graphics/openexr-website-docs/distinfo
+++ b/graphics/openexr-website-docs/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1711984113
-SHA256 (openexr/openexr-v3.2.4.tar.gz) = 0ad76308342bf8c08e55f5e53d685c4fc79f8a4e25924e6ab1d19d4f7e178d14
-SIZE (openexr/openexr-v3.2.4.tar.gz) = 18851022
+TIMESTAMP = 1728072246
+SHA256 (openexr/openexr-3.3.0.tar.gz) = a2ce475bb1b50a47c3b3db738437550027f47aaa35b04a2495ca8c3898c56c20
+SIZE (openexr/openexr-3.3.0.tar.gz) = 21308630
SHA256 (openexr/TestImages/README.rst) = 3cbb0a9ab20868940de1b9bf582bdc5ff4244cc585c682d6e40b9befb8fd593c
SIZE (openexr/TestImages/README.rst) = 2588
SHA256 (openexr/TestImages/AllHalfValues.exr) = eede573a0b59b79f21de15ee9d3b7649d58d8f2a8e7787ea34f192db3b3c84a4
@@ -31,6 +31,8 @@ SHA256 (openexr/ScanLines/CandleGlass.exr) = d84ec54c56a9f3a04cc35ef35097086f353
SIZE (openexr/ScanLines/CandleGlass.exr) = 2629900
SHA256 (openexr/ScanLines/Cannon.exr) = 1ac7ae21c22fe1b006f18e3b6b53d52330fb7314ba4b1e0c68016967182d0fa9
SIZE (openexr/ScanLines/Cannon.exr) = 1163637
+SHA256 (openexr/ScanLines/Carrots.exr) = 892d9eb1d2b22a3c7c57d22fa60c33aaa4a49ba3ead5304ec594b274aa39e4e1
+SIZE (openexr/ScanLines/Carrots.exr) = 914825
SHA256 (openexr/ScanLines/Desk.exr) = 2734d15e1ce157f73feaae5033b148bdabc98acb3084e9d892c6b01f23c24854
SIZE (openexr/ScanLines/Desk.exr) = 2424523
SHA256 (openexr/ScanLines/MtTamWest.exr) = 95731ce474982e74e154e96a6d74afb1ba0da851b673bff592fa977f87adaae5
diff --git a/graphics/openexr-website-docs/files/patch-CMakeLists.txt b/graphics/openexr-website-docs/files/patch-CMakeLists.txt
index 4d950f894370..5d3abd811f92 100644
--- a/graphics/openexr-website-docs/files/patch-CMakeLists.txt
+++ b/graphics/openexr-website-docs/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2024-03-25 18:27:30 UTC
+--- CMakeLists.txt.orig 2024-09-26 23:34:32 UTC
+++ CMakeLists.txt
-@@ -81,8 +81,6 @@ include(cmake/OpenEXRSetup.cmake)
+@@ -63,8 +63,6 @@ include(cmake/OpenEXRSetup.cmake)
include(cmake/LibraryDefine.cmake)
include(cmake/OpenEXRSetup.cmake)
@@ -9,7 +9,7 @@
# Hint: This can be set to enable custom find_package
# search paths, probably best to set it when configuring
-@@ -99,15 +97,6 @@ endif()
+@@ -81,15 +79,6 @@ endif()
enable_testing()
endif()
@@ -25,7 +25,7 @@
# Tell CMake where to find the OpenEXRConfig.cmake file. Makes it possible to call
# find_package(OpenEXR) in downstream projects
set(OpenEXR_DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake" CACHE PATH "" FORCE)
-@@ -115,10 +104,6 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmake/OpenEXRT
+@@ -97,10 +86,6 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmake/OpenEXRT
# Can be empty since we already defined the targets in add_subdirectory
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmake/OpenEXRTargets.cmake" "# Dummy file")
@@ -36,7 +36,7 @@
# If you want to use ctest to configure, build and
# upload the results, cmake has builtin support for
# submitting to CDash, or any server who speaks the
-@@ -141,33 +126,10 @@ endif()
+@@ -123,33 +108,10 @@ endif()
#set(CTEST_DROP_SITE "open.cdash.org")
#set(CTEST_DROP_LOCATION "/submit.php?project=MyProject")
#set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/graphics/openexr-website-docs/files/patch-website_news.rst b/graphics/openexr-website-docs/files/patch-website_news.rst
deleted file mode 100644
index 8b8f561a5fda..000000000000
--- a/graphics/openexr-website-docs/files/patch-website_news.rst
+++ /dev/null
@@ -1,11 +0,0 @@
---- website/news.rst.orig 2024-03-25 18:27:30 UTC
-+++ website/news.rst
-@@ -31,7 +31,7 @@ February 11, 2024 - OpenEXR v3.1.12 Released
- `CVE-2023-5841 <https://takeonme.org/cves/CVE-2023-5841.html>`_.
-
- February 11, 2024 - OpenEXR v3.1.12 Released
--===========================================
-+============================================
-
- Patch release that addresses
- `CVE-2023-5841 <https://takeonme.org/cves/CVE-2023-5841.html>`_.
diff --git a/graphics/openexr-website-docs/files/patch-website_scripts_test__images.py b/graphics/openexr-website-docs/files/patch-website_scripts_test__images.py
deleted file mode 100644
index bb6ac057cf0a..000000000000
--- a/graphics/openexr-website-docs/files/patch-website_scripts_test__images.py
+++ /dev/null
@@ -1,31 +0,0 @@
---- website/scripts/test_images.py.orig 2023-08-28 17:56:26 UTC
-+++ website/scripts/test_images.py
-@@ -127,8 +127,8 @@ def write_exr_page(rst_lpath, exr_url, exr_filename, e
-
- # Download the exr via wget
-
-- print(f'wget {exr_url}')
-- result = run (['wget', exr_url, '-O', local_exr],
-+ print(f'cp {exr_lpath}')
-+ result = run (['/bin/cp', '-f', f'{os.environ["FREEBSD_DIST"]}/{exr_lpath}', local_exr],
- stdout=PIPE, stderr=PIPE, universal_newlines=True)
- if result.returncode != 0 or not os.path.isfile(local_exr):
- raise Exception(f'failed to read {exr_url}: no such file {local_exr}')
-@@ -141,7 +141,7 @@ def write_exr_page(rst_lpath, exr_url, exr_filename, e
- stdout=PIPE, stderr=PIPE, universal_newlines=True)
-
- if result.returncode != 0 or not os.path.isfile(jpg_lpath):
-- raise Exception(f'error: failed to convert {exr_url} to {jpg_lpath}: returncode={result.returncode}, stderr={result.stderr}')
-+ raise Exception(f'error: failed to convert {exr_url} ({local_exr}) to {jpg_lpath}: returncode={result.returncode}, stderr={result.stderr}')
-
- # Read the header
-
-@@ -227,7 +227,7 @@ def write_readme(index_file, repo, tag, lpath):
- # Download via wget
-
- readme_url = f'{repo}/{tag}/{lpath}'
-- result = run (['wget', readme_url, '-O', local_readme],
-+ result = run (['/bin/cp', '-f', f'{os.environ["FREEBSD_DIST"]}/{lpath}', local_readme],
- stdout=PIPE, stderr=PIPE, universal_newlines=True)
- if result.returncode != 0:
- raise FileNotFoundError(result.stderr)
diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index 9508428b37f9..7c36cbccd009 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,5 +1,5 @@
PORTNAME?= openexr
-PORTVERSION= 3.2.4
+PORTVERSION= 3.3.0
PORTREVISION?= 0
CATEGORIES= graphics devel
.if !defined(MASTERDIR)
@@ -26,8 +26,7 @@ DISTFILES+= v2/LeftView/Balls.exr:testimages
DISTFILES+= v2/Stereo/Trunks.exr:testimages
.endif
DIST_SUBDIR= openexr # hardcode - not using ${PORTNAME} - so we can share the distdir with openexr-website-docs, avoiding double download of ...
-EXTRACT_ONLY= openexr-v${PORTVERSION}${EXTRACT_SUFX}
-NO_WRKSUBDIR= yes
+EXTRACT_ONLY= openexr-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= mandree@FreeBSD.org
COMMENT= High dynamic-range (HDR) image file format
@@ -63,8 +62,8 @@ CPPFLAGS+= -I.
# must be linked with -l{thr|pthread} explicitly
LDFLAGS+= -lpthread
-_MAJORVER= 3_2
-_VER= 31
+_MAJORVER= 3_3
+_VER= 32
_REL= ${PORTVERSION}
PLIST_SUB+= MAJORVER=${_MAJORVER} \
VER=${_VER} \
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index e1c1babd65b2..6007bd93e3f9 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1711799214
-SHA256 (openexr/openexr-v3.2.4.tar.gz) = 0ad76308342bf8c08e55f5e53d685c4fc79f8a4e25924e6ab1d19d4f7e178d14
-SIZE (openexr/openexr-v3.2.4.tar.gz) = 18851022
+TIMESTAMP = 1727901602
+SHA256 (openexr/openexr-3.3.0.tar.gz) = a2ce475bb1b50a47c3b3db738437550027f47aaa35b04a2495ca8c3898c56c20
+SIZE (openexr/openexr-3.3.0.tar.gz) = 21308630
SHA256 (openexr/Beachball/multipart.0001.exr) = 0cd032069fbaa14a2766861fef9893ea66a6494ff64650725d3b26a500df774b
SIZE (openexr/Beachball/multipart.0001.exr) = 2894260
SHA256 (openexr/Beachball/singlepart.0001.exr) = 29719942ed3c095a8f8f111fc139fc4c28f446007f5bfce00177cae585b1a87a
diff --git a/graphics/openexr/pkg-plist b/graphics/openexr/pkg-plist
index e5cfde970d20..94c40ba722ed 100644
--- a/graphics/openexr/pkg-plist
+++ b/graphics/openexr/pkg-plist
@@ -5,6 +5,7 @@ bin/exrinfo
bin/exrmakepreview
bin/exrmaketiled
bin/exrmanifest
+bin/exrmetrics
bin/exrmultipart
bin/exrmultiview
bin/exrstdattr
@@ -27,6 +28,7 @@ include/OpenEXR/IlmThreadForward.h
include/OpenEXR/IlmThreadMutex.h
include/OpenEXR/IlmThreadNamespace.h
include/OpenEXR/IlmThreadPool.h
+include/OpenEXR/IlmThreadProcessGroup.h
include/OpenEXR/IlmThreadSemaphore.h
include/OpenEXR/ImfAcesFile.h
include/OpenEXR/ImfArray.h
@@ -42,6 +44,8 @@ include/OpenEXR/ImfCompositeDeepScanLine.h
include/OpenEXR/ImfCompression.h
include/OpenEXR/ImfCompressionAttribute.h
include/OpenEXR/ImfCompressor.h
+include/OpenEXR/ImfContext.h
+include/OpenEXR/ImfContextInit.h
include/OpenEXR/ImfConvert.h
include/OpenEXR/ImfDeepCompositing.h
include/OpenEXR/ImfDeepFrameBuffer.h
@@ -183,6 +187,7 @@ libdata/pkgconfig/OpenEXR.pc
%%DOCS%%share/man/man1/exrinfo.1.gz
%%DOCS%%share/man/man1/exrmakepreview.1.gz
%%DOCS%%share/man/man1/exrmaketiled.1.gz
+%%DOCS%%share/man/man1/exrmanifest.1.gz
%%DOCS%%share/man/man1/exrmultipart.1.gz
%%DOCS%%share/man/man1/exrmultiview.1.gz
%%DOCS%%share/man/man1/exrstdattr.1.gz