pool/openexr
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 930805 from graphics

Browse Source 
- 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/request/show/930805
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openexr?expand=0&rev=48
This commit is contained in:
Dominique Leuenberger 2021-11-14 23:06:12 +00:00 committed by Git OBS Bridge
commit 475ffd0d40
7 changed files with 25 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
baselibs.conf
View File

@ -1,4 +1,5 @@
libOpenEXR-3_1-30
libOpenEXRCore-3_1-30
libOpenEXRUtil-3_1-30
libIlmThread-3_1-30
libIex-3_1-30

29
openexr-fix-armv7-2.patch
View File

@ -1,29 +0,0 @@
From daf791092ec0d7208cc222432c86464852e10fbc Mon Sep 17 00:00:00 2001
From: Kimball Thurston <kdt3rd@gmail.com>
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 <kdt3rd@gmail.com>
---
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<uint8_t> hspare;

23
openexr-fix-armv7.patch
View File

@ -1,23 +0,0 @@
From 26d2fd360edebee51e786ad75b595664a7fb881c Mon Sep 17 00:00:00 2001
From: Kimball Thurston <kdt3rd@gmail.com>
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 <kdt3rd@gmail.com>
---
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<uint8_t> hspare;

20
openexr.changes
View File

@ -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 <guillaume.gardet@opensuse.org>

6
openexr.spec
View File

@ -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

3
v3.1.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:045254e201c0f87d1d1a4b2b5815c4ae54845af2e6ec0ab88e979b5fdb30a86e
size 25588029

3
v3.1.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f70a624d1321319d8269a911c4032f24950cde52e76f46e9ecbebfcb762f28c
size 20322346