git: 8601441eb829 - main - graphics/openexr: upgrade to 3.1.7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 30 Mar 2023 22:37:15 UTC
The branch main has been updated by mandree:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8601441eb82908816f078676d000d062751d0072
commit 8601441eb82908816f078676d000d062751d0072
Author: Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2023-03-30 22:18:25 +0000
Commit: Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2023-03-30 22:26:05 +0000
graphics/openexr: upgrade to 3.1.7
This is mostly to incorporate build fixes for ARMv7 regressions,
which our 3.1.6_1 port had already brought, and bumps the library's minor
version, so let's take it although it should be functionally the same.
ChangeLog:
https://github.com/AcademySoftwareFoundation/openexr/blob/v3.1.7/CHANGES.md#version-317-march-28-2023
---
graphics/openexr/Makefile | 6 +-
graphics/openexr/distinfo | 6 +-
...PR1354-3f97750d1ec203e7d7eb8d5f30f3d5e7e68ad720 | 25 ------
...PR1366-a41a736d64e3d93baffef1042d4a3d1aaf74f1c9 | 98 ----------------------
.../files/patch-lib_OpenEXR_ImfDwaCompressor.cpp | 11 ---
.../files/patch-lib_OpenEXR_ImfDwaCompressorSimd.h | 29 -------
...atch-test_OpenEXRTest_testDwaCompressorSimd.cpp | 38 ---------
7 files changed, 6 insertions(+), 207 deletions(-)
diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index fb03a43ee97d..02a496bba594 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,6 +1,6 @@
PORTNAME= openexr
-PORTVERSION= 3.1.6
-PORTREVISION= 1
+PORTVERSION= 3.1.7
+PORTREVISION= 0
CATEGORIES= graphics devel
MAINTAINER= mandree@FreeBSD.org
@@ -27,7 +27,7 @@ PATCH_STRIP= -p1
_MAJORVER= 3_1
_VER= 30
-_MINVER= 6
+_MINVER= 7
_PLVER= 1
PLIST_SUB+= MAJORVER=${_MAJORVER} \
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index fc4e62a6a441..35f4df8c9378 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678529133
-SHA256 (AcademySoftwareFoundation-openexr-3.1.6-v3.1.6_GH0.tar.gz) = daa33d93a7b706e27368a162060df0246a7750c39a01a122d33b13f5c45d2029
-SIZE (AcademySoftwareFoundation-openexr-3.1.6-v3.1.6_GH0.tar.gz) = 20494002
+TIMESTAMP = 1680208121
+SHA256 (AcademySoftwareFoundation-openexr-3.1.7-v3.1.7_GH0.tar.gz) = 78dbca39115a1c526e6728588753955ee75fa7f5bb1a6e238bed5b6d66f91fd7
+SIZE (AcademySoftwareFoundation-openexr-3.1.7-v3.1.7_GH0.tar.gz) = 20494812
diff --git a/graphics/openexr/files/patch-PR1354-3f97750d1ec203e7d7eb8d5f30f3d5e7e68ad720 b/graphics/openexr/files/patch-PR1354-3f97750d1ec203e7d7eb8d5f30f3d5e7e68ad720
deleted file mode 100644
index edd1bb3ecc08..000000000000
--- a/graphics/openexr/files/patch-PR1354-3f97750d1ec203e7d7eb8d5f30f3d5e7e68ad720
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3f97750d1ec203e7d7eb8d5f30f3d5e7e68ad720 Mon Sep 17 00:00:00 2001
-From: Cary Phillips <cary@ilm.com>
-Date: Thu, 16 Mar 2023 07:23:18 -0700
-Subject: [PATCH] Test for AVC in unpack.c (#1354)
-
-Addresses #1353
-
-Signed-off-by: Cary Phillips <cary@ilm.com>
----
- src/lib/OpenEXRCore/unpack.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/OpenEXRCore/unpack.c b/src/lib/OpenEXRCore/unpack.c
-index 606d7c3eb..ac4e259f3 100644
---- a/src/lib/OpenEXRCore/unpack.c
-+++ b/src/lib/OpenEXRCore/unpack.c
-@@ -37,7 +37,7 @@ half_to_float8 (float* out, const uint16_t* src)
- }
- #endif
-
--#if (defined(__x86_64__) || defined(_M_X64)) && \
-+#if (defined(__x86_64__) || defined(_M_X64)) && defined(__AVX__) && \
- (defined(__F16C__) || defined(__GNUC__) || defined(__clang__))
-
- # if defined(__F16C__)
diff --git a/graphics/openexr/files/patch-PR1366-a41a736d64e3d93baffef1042d4a3d1aaf74f1c9 b/graphics/openexr/files/patch-PR1366-a41a736d64e3d93baffef1042d4a3d1aaf74f1c9
deleted file mode 100644
index 054dc785eec5..000000000000
--- a/graphics/openexr/files/patch-PR1366-a41a736d64e3d93baffef1042d4a3d1aaf74f1c9
+++ /dev/null
@@ -1,98 +0,0 @@
-From a41a736d64e3d93baffef1042d4a3d1aaf74f1c9 Mon Sep 17 00:00:00 2001
-From: Aras Pranckevicius <aras@nesnausk.org>
-Date: Mon, 20 Mar 2023 19:31:42 +0200
-Subject: [PATCH] Fix ARMv7 build by making recent ZIP NEON optimizations be
- ARMv8 (aarch64) only
-
-Should fix #1365. Recent PR (#1348) added NEON accelerated code paths
-for ZIP filtering. But that code uses several instructions that are
-ARMv8 (aarch64) only, and thus fail building on 32-bit ARM (armv7)
-platforms. Make these optimizations only kick in when building
-for 64-bit ARM platforms.
-
-Signed-off-by: Aras Pranckevicius <aras@nesnausk.org>
----
- src/lib/OpenEXR/ImfSimd.h | 4 ++++
- src/lib/OpenEXR/ImfZip.cpp | 6 +++---
- src/lib/OpenEXRCore/internal_zip.c | 8 ++++----
- 3 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/src/lib/OpenEXR/ImfSimd.h b/src/lib/OpenEXR/ImfSimd.h
-index 3053a5d4e..d1f064525 100644
---- a/src/lib/OpenEXR/ImfSimd.h
-+++ b/src/lib/OpenEXR/ImfSimd.h
-@@ -46,6 +46,10 @@
- # define IMF_HAVE_NEON
- #endif
-
-+#if defined(__aarch64__)
-+# define IMF_HAVE_NEON_AARCH64 1
-+#endif
-+
- extern "C" {
- #ifdef IMF_HAVE_SSE2
- # include <emmintrin.h>
-diff --git a/src/lib/OpenEXR/ImfZip.cpp b/src/lib/OpenEXR/ImfZip.cpp
-index 0e2b031d8..8dd53bea9 100644
---- a/src/lib/OpenEXR/ImfZip.cpp
-+++ b/src/lib/OpenEXR/ImfZip.cpp
-@@ -160,7 +160,7 @@ reconstruct_sse41 (char* buf, size_t outSize)
-
- #endif
-
--#ifdef IMF_HAVE_NEON
-+#ifdef IMF_HAVE_NEON_AARCH64
-
- void
- reconstruct_neon (char* buf, size_t outSize)
-@@ -262,7 +262,7 @@ interleave_sse2 (const char* source, size_t outSize, char* out)
-
- #endif
-
--#ifdef IMF_HAVE_NEON
-+#ifdef IMF_HAVE_NEON_AARCH64
-
- void
- interleave_neon (const char* source, size_t outSize, char* out)
-@@ -380,7 +380,7 @@ Zip::initializeFuncs ()
- }
- #endif
-
--#ifdef IMF_HAVE_NEON
-+#ifdef IMF_HAVE_NEON_AARCH64
- reconstruct = reconstruct_neon;
- interleave = interleave_neon;
- #endif
-diff --git a/src/lib/OpenEXRCore/internal_zip.c b/src/lib/OpenEXRCore/internal_zip.c
-index e829e6d7c..1374cab0d 100644
---- a/src/lib/OpenEXRCore/internal_zip.c
-+++ b/src/lib/OpenEXRCore/internal_zip.c
-@@ -24,8 +24,8 @@
- # define IMF_HAVE_SSE4_1 1
- # include <smmintrin.h>
- #endif
--#if defined(__ARM_NEON)
--# define IMF_HAVE_NEON 1
-+#if defined(__aarch64__)
-+# define IMF_HAVE_NEON_AARCH64 1
- # include <arm_neon.h>
- #endif
-
-@@ -78,7 +78,7 @@ reconstruct (uint8_t* buf, uint64_t outSize)
- prev = d;
- }
- }
--#elif defined(IMF_HAVE_NEON)
-+#elif defined(IMF_HAVE_NEON_AARCH64)
- static void
- reconstruct (uint8_t* buf, uint64_t outSize)
- {
-@@ -174,7 +174,7 @@ interleave (uint8_t* out, const uint8_t* source, uint64_t outSize)
- *(sOut++) = (i % 2 == 0) ? *(t1++) : *(t2++);
- }
-
--#elif defined(IMF_HAVE_NEON)
-+#elif defined(IMF_HAVE_NEON_AARCH64)
- static void
- interleave (uint8_t* out, const uint8_t* source, uint64_t outSize)
- {
diff --git a/graphics/openexr/files/patch-lib_OpenEXR_ImfDwaCompressor.cpp b/graphics/openexr/files/patch-lib_OpenEXR_ImfDwaCompressor.cpp
deleted file mode 100644
index 5b908fdad69e..000000000000
--- a/graphics/openexr/files/patch-lib_OpenEXR_ImfDwaCompressor.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/lib/OpenEXR/ImfDwaCompressor.cpp.orig 2023-03-05 20:23:47 UTC
-+++ ./src/lib/OpenEXR/ImfDwaCompressor.cpp
-@@ -2888,7 +2888,7 @@ DwaCompressor::initializeFuncs()
- fromHalfZigZag = fromHalfZigZag_f16c;
- }
-
--#ifdef IMF_HAVE_NEON
-+#ifdef IMF_HAVE_NEON_AARCH64
- {
- convertFloatToHalf64 = convertFloatToHalf64_neon;
- fromHalfZigZag = fromHalfZigZag_neon;
diff --git a/graphics/openexr/files/patch-lib_OpenEXR_ImfDwaCompressorSimd.h b/graphics/openexr/files/patch-lib_OpenEXR_ImfDwaCompressorSimd.h
deleted file mode 100644
index e9eff7e1a909..000000000000
--- a/graphics/openexr/files/patch-lib_OpenEXR_ImfDwaCompressorSimd.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./src/lib/OpenEXR/ImfDwaCompressorSimd.h.orig 2023-03-05 20:23:47 UTC
-+++ ./src/lib/OpenEXR/ImfDwaCompressorSimd.h
-@@ -395,7 +395,7 @@ convertFloatToHalf64_scalar (unsigned short* dst, floa
- dst[i] = ((half) src[i]).bits ();
- }
-
--#ifdef IMF_HAVE_NEON
-+#ifdef IMF_HAVE_NEON_AARCH64
-
- void
- convertFloatToHalf64_neon (unsigned short* dst, float* src)
-@@ -821,7 +821,7 @@ fromHalfZigZag_f16c (unsigned short* src, float* dst)
- #endif /* defined IMF_HAVE_GCC_INLINEASM_X86_64 */
- }
-
--#ifdef IMF_HAVE_NEON
-+#ifdef IMF_HAVE_NEON_AARCH64
-
-
- void
-@@ -856,7 +856,7 @@ fromHalfZigZag_neon(unsigned short* __restrict__ src,
- }
- }
-
--#endif // IMF_HAVE_NEON
-+#endif // IMF_HAVE_NEON_AARCH64
-
- //
- // Inverse 8x8 DCT, only inverting the DC. This assumes that
diff --git a/graphics/openexr/files/patch-test_OpenEXRTest_testDwaCompressorSimd.cpp b/graphics/openexr/files/patch-test_OpenEXRTest_testDwaCompressorSimd.cpp
deleted file mode 100644
index 4d9991f463d3..000000000000
--- a/graphics/openexr/files/patch-test_OpenEXRTest_testDwaCompressorSimd.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./src/test/OpenEXRTest/testDwaCompressorSimd.cpp.orig 2023-03-05 20:23:47 UTC
-+++ ./src/test/OpenEXRTest/testDwaCompressorSimd.cpp
-@@ -401,7 +401,7 @@ testFloatToHalf()
- }
- }
-
--#ifdef IMF_HAVE_NEON
-+#ifdef IMF_HAVE_NEON_AARCH64
- {
- cout << " convertFloatToHalf64_neon()" << endl;
- for (int iter = 0; iter < numIter; ++iter)
-@@ -430,7 +430,7 @@ testFloatToHalf()
- }
- }
- }
-- #endif // IMF_HAVE_NEON
-+ #endif // IMF_HAVE_NEON_AARCH64
- }
-
- //
-@@ -516,7 +516,7 @@ testFromHalfZigZag()
- } // iter
- } // f16c
-
--#ifdef IMF_HAVE_NEON
-+#ifdef IMF_HAVE_NEON_AARCH64
- {
- const int numIter = 1000000;
- Rand48 rand48 (0);
-@@ -553,7 +553,7 @@ testFromHalfZigZag()
- } // iter
- } // neon
-
--#endif // IMF_HAVE_NEON
-+#endif // IMF_HAVE_NEON_AARCH64
- }
-
-