diff --git a/_service b/_service index cbcbf68..2dfadc4 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ https://github.com/sekrit-twc/zimg.git git @PARENT_TAG@ - release([0-9\.]*) - release-3.0.1 + release-([0-9\.]*) + release-3.0.3 diff --git a/zimg-3.0.1.obscpio b/zimg-3.0.1.obscpio deleted file mode 100644 index b781a36..0000000 --- a/zimg-3.0.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbc514a114145d2cb895463c4eb046329f77da26df5758875144d95d1209f603 -size 6154765 diff --git a/zimg-3.0.3.obscpio b/zimg-3.0.3.obscpio new file mode 100644 index 0000000..e6cf76c --- /dev/null +++ b/zimg-3.0.3.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b375f776b0b404c307fc3ea962572236eb29c9642d271731ac855114df2c22c2 +size 6158349 diff --git a/zimg-s390x-unit-tests.patch b/zimg-s390x-unit-tests.patch new file mode 100644 index 0000000..e4a7b66 --- /dev/null +++ b/zimg-s390x-unit-tests.patch @@ -0,0 +1,60 @@ +From b2bee8460a0f6ecf049e27d0a2090c87e871d951 Mon Sep 17 00:00:00 2001 +From: Mike Gorse +Date: Wed, 22 Sep 2021 11:57:47 -0500 +Subject: [PATCH] FIx unit tests on big endian systems + +--- + test/extra/sha1/config.h | 6 ++++++ + test/graph/filter_validator.cpp | 8 ++++++++ + 2 files changed, 14 insertions(+) + +diff --git a/test/extra/sha1/config.h b/test/extra/sha1/config.h +index ea853f0..7bc4e00 100644 +--- a/test/extra/sha1/config.h ++++ b/test/extra/sha1/config.h +@@ -1,3 +1,5 @@ ++#include ++ + #ifndef LITTLE_ENDIAN + #define LITTLE_ENDIAN 4321 + #endif +@@ -7,5 +9,9 @@ + #endif + + #ifndef BYTE_ORDER ++#if defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN) ++ #define BYTE_ORDER BIG_ENDIAN ++#else + #define BYTE_ORDER LITTLE_ENDIAN + #endif ++#endif +diff --git a/test/graph/filter_validator.cpp b/test/graph/filter_validator.cpp +index f0d6859..d768ebf 100644 +--- a/test/graph/filter_validator.cpp ++++ b/test/graph/filter_validator.cpp +@@ -13,6 +13,8 @@ + + #include "gtest/gtest.h" + ++#include ++ + extern "C" { + #include "sha1/sha1.h" + } +@@ -40,7 +42,13 @@ void hash_buffer(const AuditBuffer &buf, unsigned p, unsigned width, unsigned + + for (unsigned i = 0; i < height; ++i) { + const unsigned char *ptr = static_cast(image_buffer[p][i]); ++#if (__BYTE_ORDER == __LITTLE_ENDIAN) + SHA1Update(&sha_ctx, ptr, width * sizeof(T)); ++#else ++ for (unsigned j = 0; j < width; j++) ++ for (int k = sizeof(T) - 1; k >= 0; k--) ++ SHA1Update(&sha_ctx, ptr + (j * sizeof(T)) + k, 1); ++#endif + } + + SHA1Final(digest, &sha_ctx); +-- +2.32.0 + diff --git a/zimg.changes b/zimg.changes index ab98d3b..bc15afa 100644 --- a/zimg.changes +++ b/zimg.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Sep 22 17:19:43 UTC 2021 - Michael Gorse + +- Update to 3.0.3: + * depth: fix out-of-bounds read in SSE2/AVX2 error diffusion + (introduced in 2.5) + * colorspace: revert SMPTE 240M behavior change (introduced in + 3.0.2) + * Changes in version 3.0.2: + * api: default to ZIMG_CPU_AUTO when graph params are null + * colorspace: fix incorrect SMPTE 240M transfer function + * colorspace: fix underflow in AVX-512 ST.2084 transfer functions + * graph: fix conversion from fullrange grey to RGB + * arm: fix data alignment + * x86: optimizations for AMD Zen3 processors +- Add zimg-s390x-unit-tests.patch: fix unit tests on big endian + systems. + ------------------------------------------------------------------- Thu Sep 10 17:43:22 UTC 2020 - Dirk Mueller diff --git a/zimg.obsinfo b/zimg.obsinfo index 11c4c4a..cc8febd 100644 --- a/zimg.obsinfo +++ b/zimg.obsinfo @@ -1,5 +1,5 @@ name: zimg -version: 3.0.1 -mtime: 1598190477 -commit: e17ee6cf72509c32c15067b32615849e69486367 +version: 3.0.3 +mtime: 1630862474 +commit: 1658ce429cf944e88868a88d8aef4683425d4e78 diff --git a/zimg.spec b/zimg.spec index 2b78f40..cbe9ca4 100644 --- a/zimg.spec +++ b/zimg.spec @@ -18,7 +18,7 @@ %define sover 2 Name: zimg -Version: 3.0.1 +Version: 3.0.3 Release: 0 Summary: Scaling, colorspace conversion, and dithering library License: WTFPL @@ -26,6 +26,7 @@ Group: Development/Libraries/C and C++ URL: https://github.com/sekrit-twc/zimg Source0: zimg-%{version}.tar.xz Source99: baselibs.conf +Patch0: zimg-s390x-unit-tests.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cmake @@ -56,6 +57,7 @@ developing applications that use libzimg%{sover}. %prep %setup -q +%patch0 -p1 %build autoreconf -fiv