From nobody Thu Mar 30 22:37:15 2023 X-Original-To: dev-commits-ports-main@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 4Pndb000Q3z42SFN; Thu, 30 Mar 2023 22:37:16 +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 4PndZz6cMKz45yl; Thu, 30 Mar 2023 22:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680215835; 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=ULo9pAOxrZQgNp8MTIMKOC/igH/AMQawjixtLFXUYsg=; b=PDgHFZCiqS817Rfh3M8jaDRZs9iEGhgQB7jF6T/o6QNYXGlaV35j0ZghDpEgXGkn6+m0Yf gl/+EaPN/8rXeNogHTwn2pUPNLRHzB4GPHvZtyyzAhHfr1BainznQxJ8AFAKLQfuYiBzHf HPB/kAJUSotPlp4EeZei9sce5x+vK4LDx7BpFzhUukFkJb92jeSIGVymSehQgiPrckl9vL ed0PExnfz7e52BFDZXsjDlaZKpnPJEd1Suy9Vb7BM0KrlCi7QnA4b9FFZSHcFodaHzt82G lHW00pJgD3xcXmcaanMZ1UcaxGrEIsElQXg7zqK+zTamahozgBDyVKoA/3DPGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680215835; 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=ULo9pAOxrZQgNp8MTIMKOC/igH/AMQawjixtLFXUYsg=; b=MsDOtjDeyBlOSt24oeSpwod7+b3GhbfHi+e0/4VmAM/sl+Px5JT4JIBvkpZh4CniN3SUhF j1GYZaZ56N1NIIi2PDQgEf8KQNsR+34LGNnfnScAqfK6BntoR7JaGzFyXpnAB03haRBJP9 8nkehYowVRrjB7CHBmQJvHNmCUZG3JDFckKwHsGMfb5s4ozsvIUMdprncSNEq/x3PVAP+C pG7HdiUi0t4O3vDJ0eJ7ayhTV0bl+e/QkQdFIlZkg9V2pgS/vgL/Bj9M3hEStkH2TpPdLs +9AZL2cFeo+eAtvu+BMbNLyXZPRYkGTZv9EDADuCUeNaLFeDT0E3++x8wkRfMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680215835; a=rsa-sha256; cv=none; b=VLiOCxGUNy2h6aHahvKKPLJEmQxrpwTp9Vflr/b+/+/d5q5cTkVTK2yHb/xRbB057FyiVD 8lS2qc3pwOfn6DGcqZV9u3pgQ7uz1wSogIYymiznj8tBdsLVsNDSXXO7tjkGsaSOvVR5Em oEfUq+dvPH7F5mrzd2DwjsRuKq5acQxTJwJn5E9iIEQns+3v8nRLBZFwAwPTJ+LeCJjfUm NNILzCMx1BDrvCnWO48lqH/rWXhUkYbiNqXNGMHyDDbepTXfQ5gwOogMwB5tqDqYytx2eC j9XWiC20du32PSr8ZCv1ad5ji0oenC+afc2IbMkWzifRinpzYpsPBdfno9BC+g== 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 4PndZz5YBwzVGv; Thu, 30 Mar 2023 22:37:15 +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 32UMbFIj068807; Thu, 30 Mar 2023 22:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UMbFLL068806; Thu, 30 Mar 2023 22:37:15 GMT (envelope-from git) Date: Thu, 30 Mar 2023 22:37:15 GMT Message-Id: <202303302237.32UMbFLL068806@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 8601441eb829 - main - graphics/openexr: upgrade to 3.1.7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8601441eb82908816f078676d000d062751d0072 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=8601441eb82908816f078676d000d062751d0072 commit 8601441eb82908816f078676d000d062751d0072 Author: Matthias Andree AuthorDate: 2023-03-30 22:18:25 +0000 Commit: Matthias Andree 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 -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 ---- - 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 -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 ---- - 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 -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 - #endif --#if defined(__ARM_NEON) --# define IMF_HAVE_NEON 1 -+#if defined(__aarch64__) -+# define IMF_HAVE_NEON_AARCH64 1 - # include - #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 - } - -