From 32251b60779604fbea5e095585468d86e02be27e97c860f5f44fe63196fea160 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 9 Nov 2021 10:18:35 +0000 Subject: [PATCH 1/2] - version update to 3.1.3 Patch release with a change to default zip compression level: * Default zip compression level is now 4 (instead of 6), which in our tests improves compression times by 2x with only a tiny drop in compression ratio. * ``setDefaultZipCompression()`` and ``setDefaultDwaCompression()`` now set default compression levels for writing. * The Header how has ``zipCompressionLevel()`` and ``dwaCompressionLevel()`` to return the levels used for writing. Also, various bug fixes, build improvements, and documentation updates. In particular: * Fixes a build failure with Imath prior to v3.1 * Fixes a bug in detecting invalid chromaticity values - deleted patches - openexr-fix-armv7-2.patch (upstreamed) - openexr-fix-armv7.patch (upstreamed) OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=77 --- openexr-fix-armv7-2.patch | 29 ----------------------------- openexr-fix-armv7.patch | 23 ----------------------- openexr.changes | 20 ++++++++++++++++++++ openexr.spec | 6 +----- v3.1.1.tar.gz | 3 --- v3.1.3.tar.gz | 3 +++ 6 files changed, 24 insertions(+), 60 deletions(-) delete mode 100644 openexr-fix-armv7-2.patch delete mode 100644 openexr-fix-armv7.patch delete mode 100644 v3.1.1.tar.gz create mode 100644 v3.1.3.tar.gz diff --git a/openexr-fix-armv7-2.patch b/openexr-fix-armv7-2.patch deleted file mode 100644 index a266dcb..0000000 --- a/openexr-fix-armv7-2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From daf791092ec0d7208cc222432c86464852e10fbc Mon Sep 17 00:00:00 2001 -From: Kimball Thurston -Date: Thu, 2 Sep 2021 21:08:39 +1200 -Subject: [PATCH] the HufDec struct used during decompression also contains a - pointer - -Account for that for 32-bit machines in the unit / coverage test. - -Signed-off-by: Kimball Thurston ---- - src/test/OpenEXRCoreTest/compression.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/test/OpenEXRCoreTest/compression.cpp b/src/test/OpenEXRCoreTest/compression.cpp -index b10fff9ad..aed0257ff 100644 ---- a/src/test/OpenEXRCoreTest/compression.cpp -+++ b/src/test/OpenEXRCoreTest/compression.cpp -@@ -1333,8 +1333,9 @@ testHUF (const std::string& tempdir) - { - uint64_t esize = internal_exr_huf_compress_spare_bytes (); - uint64_t dsize = internal_exr_huf_decompress_spare_bytes (); -- EXRCORE_TEST (esize == 65537 * (8 + 8 + sizeof(void*) + 4)); -- EXRCORE_TEST (dsize == (65537 * 8 + (1 << 14) * 16)); -+ EXRCORE_TEST (esize == 65537 * (8 + 8 + sizeof (uint64_t*) + 4)); -+ EXRCORE_TEST ( -+ dsize == (65537 * 8 + (1 << 14) * (sizeof (uint32_t*) + 4 + 4))); - - std::vector hspare; - diff --git a/openexr-fix-armv7.patch b/openexr-fix-armv7.patch deleted file mode 100644 index e03c47d..0000000 --- a/openexr-fix-armv7.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 26d2fd360edebee51e786ad75b595664a7fb881c Mon Sep 17 00:00:00 2001 -From: Kimball Thurston -Date: Tue, 31 Aug 2021 04:00:39 +1200 -Subject: [PATCH] Fixes #1135, test which assumed 64-bit pointer size (#1136) - -Signed-off-by: Kimball Thurston ---- - src/test/OpenEXRCoreTest/compression.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/test/OpenEXRCoreTest/compression.cpp b/src/test/OpenEXRCoreTest/compression.cpp -index 5d408ca7c..b10fff9ad 100644 ---- a/src/test/OpenEXRCoreTest/compression.cpp -+++ b/src/test/OpenEXRCoreTest/compression.cpp -@@ -1333,7 +1333,7 @@ testHUF (const std::string& tempdir) - { - uint64_t esize = internal_exr_huf_compress_spare_bytes (); - uint64_t dsize = internal_exr_huf_decompress_spare_bytes (); -- EXRCORE_TEST (esize == 65537 * (8 + 8 + 8 + 4)); -+ EXRCORE_TEST (esize == 65537 * (8 + 8 + sizeof(void*) + 4)); - EXRCORE_TEST (dsize == (65537 * 8 + (1 << 14) * 16)); - - std::vector hspare; diff --git a/openexr.changes b/openexr.changes index 0cebce1..954e61d 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 9 10:15:53 UTC 2021 - pgajdos@suse.com + +- version update to 3.1.3 + Patch release with a change to default zip compression level: + * Default zip compression level is now 4 (instead of 6), which in our + tests improves compression times by 2x with only a tiny drop in + compression ratio. + * ``setDefaultZipCompression()`` and ``setDefaultDwaCompression()`` + now set default compression levels for writing. + * The Header how has ``zipCompressionLevel()`` and + ``dwaCompressionLevel()`` to return the levels used for writing. + Also, various bug fixes, build improvements, and documentation + updates. In particular: + * Fixes a build failure with Imath prior to v3.1 + * Fixes a bug in detecting invalid chromaticity values +- deleted patches + - openexr-fix-armv7-2.patch (upstreamed) + - openexr-fix-armv7.patch (upstreamed) + ------------------------------------------------------------------- Tue Aug 31 06:23:32 UTC 2021 - Guillaume GARDET diff --git a/openexr.spec b/openexr.spec index 0cdf1d4..a3be8b1 100644 --- a/openexr.spec +++ b/openexr.spec @@ -22,7 +22,7 @@ %define sonum 30 %global so_suffix -3_1 Name: openexr -Version: 3.1.1 +Version: 3.1.3 Release: 0 Summary: Utilities for working with HDR images in OpenEXR format License: BSD-3-Clause @@ -30,10 +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/1135 -Patch1: openexr-fix-armv7.patch -# PATCH-FIX-UPSTREAM https://github.com/AcademySoftwareFoundation/openexr/issues/1135 -Patch2: openexr-fix-armv7-2.patch BuildRequires: cmake >= 3.12 BuildRequires: fltk-devel BuildRequires: freeglut-devel diff --git a/v3.1.1.tar.gz b/v3.1.1.tar.gz deleted file mode 100644 index 2864d12..0000000 --- a/v3.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:045254e201c0f87d1d1a4b2b5815c4ae54845af2e6ec0ab88e979b5fdb30a86e -size 25588029 diff --git a/v3.1.3.tar.gz b/v3.1.3.tar.gz new file mode 100644 index 0000000..6fcb4d5 --- /dev/null +++ b/v3.1.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f70a624d1321319d8269a911c4032f24950cde52e76f46e9ecbebfcb762f28c +size 20322346 From 2cfaf3899635ad13c620d71b6a54e63c72fd015e048810a2ddebd5e94b1b62a6 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 11 Nov 2021 07:16:31 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=78 --- baselibs.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/baselibs.conf b/baselibs.conf index 82660d9..533e803 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,5 @@ libOpenEXR-3_1-30 +libOpenEXRCore-3_1-30 libOpenEXRUtil-3_1-30 libIlmThread-3_1-30 libIex-3_1-30