diff --git a/1488.patch b/1488.patch deleted file mode 100644 index a6852fd..0000000 --- a/1488.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 1461a92d198a8d7586bbb7a5f1c99311a175a223 Mon Sep 17 00:00:00 2001 -From: Kimball Thurston -Date: Sat, 15 Jul 2023 10:38:22 +1200 -Subject: [PATCH] Revert pre-computed values - -It would appear the precomputed values cause differences from the -specific computed values on other architectures. - -Signed-off-by: Kimball Thurston ---- - src/lib/OpenEXRCore/internal_dwa_simd.h | 46 ++++++++++++------------- - 1 file changed, 23 insertions(+), 23 deletions(-) - -diff --git a/src/lib/OpenEXRCore/internal_dwa_simd.h b/src/lib/OpenEXRCore/internal_dwa_simd.h -index 6432c5fb3..64399ebf8 100644 ---- a/src/lib/OpenEXRCore/internal_dwa_simd.h -+++ b/src/lib/OpenEXRCore/internal_dwa_simd.h -@@ -871,13 +871,13 @@ dctInverse8x8DcOnly (float* data) - static inline void - dctInverse8x8_scalar (float* data, int zeroedRows) - { -- const float a = 0.35355362513961314f;//.5f * cosf (3.14159f / 4.0f); -- const float b = 0.4903926563794112f;//.5f * cosf (3.14159f / 16.0f); -- const float c = 0.4619398297234211f;//.5f * cosf (3.14159f / 8.0f); -- const float d = 0.4157349443626743f;//.5f * cosf (3.f * 3.14159f / 16.0f); -- const float e = 0.2777854612564676f;//.5f * cosf (5.f * 3.14159f / 16.0f); -- const float f = 0.19134217585694352f;//.5f * cosf (3.f * 3.14159f / 8.0f); -- const float g = 0.09754573032714427f;//.5f * cosf (7.f * 3.14159f / 16.0f); -+ const float a = .5f * cosf (3.14159f / 4.0f); -+ const float b = .5f * cosf (3.14159f / 16.0f); -+ const float c = .5f * cosf (3.14159f / 8.0f); -+ const float d = .5f * cosf (3.f * 3.14159f / 16.0f); -+ const float e = .5f * cosf (5.f * 3.14159f / 16.0f); -+ const float f = .5f * cosf (3.f * 3.14159f / 8.0f); -+ const float g = .5f * cosf (7.f * 3.14159f / 16.0f); - - float alpha[4], beta[4], theta[4], gamma[4]; - -@@ -1868,7 +1868,7 @@ dctInverse8x8_avx_7 (float* data) - // Default implementation - // - --void -+static void - dctForward8x8 (float* data) - { - float A0, A1, A2, A3, A4, A5, A6, A7; -@@ -1877,20 +1877,20 @@ dctForward8x8 (float* data) - float* srcPtr = data; - float* dstPtr = data; - -- const float c1 = 0.9807853127588224f;//cosf (3.14159f * 1.0f / 16.0f); -- const float c2 = 0.9238796594468422f;//cosf (3.14159f * 2.0f / 16.0f); -- const float c3 = 0.8314698887253485f;//cosf (3.14159f * 3.0f / 16.0f); -- const float c4 = 0.7071072502792263f;//cosf (3.14159f * 4.0f / 16.0f); -- const float c5 = 0.5555709225129352f;//cosf (3.14159f * 5.0f / 16.0f); -- const float c6 = 0.38268435171388704f;//cosf (3.14159f * 6.0f / 16.0f); -- const float c7 = 0.19509146065428853f;//cosf (3.14159f * 7.0f / 16.0f); -- -- const float c1Half = 0.4903926563794112f;//.5f * c1; -- const float c2Half = 0.4619398297234211f;//.5f * c2; -- const float c3Half = 0.4157349443626743f;//.5f * c3; -- const float c5Half = 0.2777854612564676f;//.5f * c5; -- const float c6Half = 0.19134217585694352f;//.5f * c6; -- const float c7Half = 0.09754573032714427f;//.5f * c7; -+ const float c1 = cosf (3.14159f * 1.0f / 16.0f); -+ const float c2 = cosf (3.14159f * 2.0f / 16.0f); -+ const float c3 = cosf (3.14159f * 3.0f / 16.0f); -+ const float c4 = cosf (3.14159f * 4.0f / 16.0f); -+ const float c5 = cosf (3.14159f * 5.0f / 16.0f); -+ const float c6 = cosf (3.14159f * 6.0f / 16.0f); -+ const float c7 = cosf (3.14159f * 7.0f / 16.0f); -+ -+ const float c1Half = .5f * c1; -+ const float c2Half = .5f * c2; -+ const float c3Half = .5f * c3; -+ const float c5Half = .5f * c5; -+ const float c6Half = .5f * c6; -+ const float c7Half = .5f * c7; - - // - // First pass - do a 1D DCT over the rows and write the diff --git a/openexr.changes b/openexr.changes index 97a6caf..c24cc8d 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Aug 24 13:21:39 UTC 2023 - pgajdos@suse.com + +- version update to 3.1.11 + ## Version 3.1.11 (August 13, 2023) + Patch release that fixes a build failure with `-march=x86-64-v3` + * Initialize `regs[]` to 0 in `check_for_x86_simd` + * Fix CPUID detection with `-march=x86-64-v3` + ## Version 3.1.10 (August 2, 2023) + Patch release that addresses miscellaneous build issues, test + failures, and performance regressions, as well as: + * OSS-fuzz [59457](https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=59457) + Heap-buffer-overflow in `LossyDctDecoder_execute` + * Readdress #1456: disallow NaNs in `testOptimizedInterleavePatterns` + * Revert pre-computed values + * Fix handling for corrupt number of DC components + * Add `OPENEXR_MISSING_ARM_VLD1` workaround to `internal_dwa_simd.h` + * Fix Huffman performance regression on Linux/clang + * Fix range check in dwa compressor + * Fix build with i386 and musl libc + * Fix the code contains unhandled character + * Fix cpu detection of sse2 on non-64 x86 + * Fix the code contains unhandled character + * Fix gcc-11 warnings: signed/unsigned integer comparison, unused variables + * Fix macOS and Windows build failures when threading is disabled + * Fix build error on win_arm64 +- deleted patches + - 1488.patch (upstreamed) + ------------------------------------------------------------------- Tue Jul 18 08:08:13 UTC 2023 - Guillaume GARDET diff --git a/openexr.spec b/openexr.spec index d09577e..f27ff9a 100644 --- a/openexr.spec +++ b/openexr.spec @@ -22,7 +22,7 @@ %define sonum 30 %global so_suffix -3_1 Name: openexr -Version: 3.1.9 +Version: 3.1.11 Release: 0 Summary: Utilities for working with HDR images in OpenEXR format License: BSD-3-Clause @@ -30,8 +30,6 @@ Group: Development/Libraries/C and C++ URL: https://www.openexr.com/ Source0: https://github.com/openexr/openexr/archive/v%{version}.tar.gz Source2: baselibs.conf -# PATCH-FIX-UPSTREAM - https://github.com/AcademySoftwareFoundation/openexr/issues/1460 -Patch0: 1488.patch BuildRequires: cmake >= 3.12 BuildRequires: freeglut-devel BuildRequires: gcc-c++ diff --git a/v3.1.11.tar.gz b/v3.1.11.tar.gz new file mode 100644 index 0000000..c1f6bba --- /dev/null +++ b/v3.1.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1 +size 20539852 diff --git a/v3.1.9.tar.gz b/v3.1.9.tar.gz deleted file mode 100644 index 09ad2b8..0000000 --- a/v3.1.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:103e902d3902800ab07b5f3a298be7afd2755312737b2cdbfa01326ff99dac07 -size 20538624