From ebd89965d195c87e4545c2daa3f3be9e5ac0e973916e291671036e605198684c Mon Sep 17 00:00:00 2001 From: Mia Herkt Date: Wed, 5 Aug 2020 01:05:12 +0000 Subject: [PATCH 1/5] - Update to version 3.0 (API 2.4): * api: support alpha channel as the fourth plane * colorspace: accept UNSPECIFIED transfer characteristics in more situations * colorspace: fix conversion from ICtCp to ARIB STD-B67 * depth: fix out of bounds access in SSE2 ordered dither * graph: rewrite for alpha channel support * resize: fix incorrect rounding when calculating pixel coordinates * resize: AVX-512 VNNI code paths * arm: NEON/ASIMD code paths - Drop patches: * update-matrix3.cpp.patch * colorspace-fix-assertion.patch * colorspace-fix-assertion-part2.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/zimg?expand=0&rev=28 --- _service | 2 +- colorspace-fix-assertion-part2.patch | 36 ---------------------------- colorspace-fix-assertion.patch | 34 -------------------------- update-matrix3.cpp.patch | 21 ---------------- zimg-2.9.3.obscpio | 3 --- zimg-3.0.obscpio | 3 +++ zimg.changes | 19 +++++++++++++++ zimg.obsinfo | 6 ++--- zimg.spec | 19 ++++++--------- 9 files changed, 33 insertions(+), 110 deletions(-) delete mode 100644 colorspace-fix-assertion-part2.patch delete mode 100644 colorspace-fix-assertion.patch delete mode 100644 update-matrix3.cpp.patch delete mode 100644 zimg-2.9.3.obscpio create mode 100644 zimg-3.0.obscpio diff --git a/_service b/_service index 9904898..cf19cd7 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git @PARENT_TAG@ release([0-9\.]*) - release-2.9.3 + release-3.0 diff --git a/colorspace-fix-assertion-part2.patch b/colorspace-fix-assertion-part2.patch deleted file mode 100644 index f0c1eda..0000000 --- a/colorspace-fix-assertion-part2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bb17c9433bfdc78e296982aad32981bcb9d5514c Mon Sep 17 00:00:00 2001 -From: sekrit-twc -Date: Tue, 17 Mar 2020 10:40:15 -0700 -Subject: [PATCH] colorspace: fix assertions - ---- - src/zimg/colorspace/operation.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/zimg/colorspace/operation.cpp b/src/zimg/colorspace/operation.cpp -index 1218c7b..76f9d7a 100644 ---- a/src/zimg/colorspace/operation.cpp -+++ b/src/zimg/colorspace/operation.cpp -@@ -65,7 +65,8 @@ std::unique_ptr create_lms_to_ictcp_operation(const ColorspaceDefinit - std::unique_ptr create_gamma_to_linear_operation(const ColorspaceDefinition &in, const ColorspaceDefinition &out, const OperationParams ¶ms, CPUClass cpu) - { - zassert_d(in.primaries == out.primaries, "primaries mismatch"); -- zassert_d(in.matrix == MatrixCoefficients::RGB && out.matrix == MatrixCoefficients::RGB, "must be RGB"); -+ zassert_d((in.matrix == MatrixCoefficients::RGB || in.matrix == MatrixCoefficients::REC_2100_LMS) && -+ (out.matrix == MatrixCoefficients::RGB || out.matrix == MatrixCoefficients::REC_2100_LMS), "must be RGB or LMS"); - zassert_d(in.transfer != TransferCharacteristics::LINEAR && out.transfer == TransferCharacteristics::LINEAR, "wrong transfer characteristics"); - - if (in.transfer == TransferCharacteristics::ARIB_B67 && use_display_referred_b67(in.primaries, params)) -@@ -77,7 +78,8 @@ std::unique_ptr create_gamma_to_linear_operation(const ColorspaceDefi - std::unique_ptr create_linear_to_gamma_operation(const ColorspaceDefinition &in, const ColorspaceDefinition &out, const OperationParams ¶ms, CPUClass cpu) - { - zassert_d(in.primaries == out.primaries, "primaries mismatch"); -- zassert_d(in.matrix == MatrixCoefficients::RGB && out.matrix == MatrixCoefficients::RGB, "must be RGB"); -+ zassert_d((in.matrix == MatrixCoefficients::RGB || in.matrix == MatrixCoefficients::REC_2100_LMS) && -+ (out.matrix == MatrixCoefficients::RGB || out.matrix == MatrixCoefficients::REC_2100_LMS), "must be RGB or LMS"); - zassert_d(in.transfer == TransferCharacteristics::LINEAR && out.transfer != TransferCharacteristics::LINEAR, "wrong transfer characteristics"); - - if (out.transfer == TransferCharacteristics::ARIB_B67 && use_display_referred_b67(out.primaries, params)) --- -2.25.1 - diff --git a/colorspace-fix-assertion.patch b/colorspace-fix-assertion.patch deleted file mode 100644 index 6364aaf..0000000 --- a/colorspace-fix-assertion.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fbd1ecebde3e336ad4f205381867adddfd4f754b Mon Sep 17 00:00:00 2001 -From: sekrit-twc -Date: Sat, 8 Feb 2020 12:46:02 -0800 -Subject: [PATCH] colorspace: fix assertion - ---- - src/zimg/colorspace/operation_impl.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/zimg/colorspace/operation_impl.cpp b/src/zimg/colorspace/operation_impl.cpp -index f8bad30..ccd16b1 100644 ---- a/src/zimg/colorspace/operation_impl.cpp -+++ b/src/zimg/colorspace/operation_impl.cpp -@@ -343,7 +343,7 @@ std::unique_ptr create_inverse_arib_b67_operation(const Matrix3x3 &m, - std::unique_ptr create_cl_yuv_to_rgb_operation(const ColorspaceDefinition &in, const ColorspaceDefinition &out, const OperationParams ¶ms, CPUClass cpu) - { - zassert_d(in.primaries == out.primaries, "primaries mismatch"); -- zassert_d(in.matrix == MatrixCoefficients::REC_2020_CL && in.transfer == TransferCharacteristics::REC_709, "must be 2020 CL"); -+ zassert_d((in.matrix == MatrixCoefficients::REC_2020_CL || in.matrix == MatrixCoefficients::CHROMATICITY_DERIVED_CL) && in.transfer == TransferCharacteristics::REC_709, "must be 2020 CL"); - zassert_d(out.matrix == MatrixCoefficients::RGB && out.transfer == TransferCharacteristics::LINEAR, "must be linear RGB"); - - // CL is always scene-referred. -@@ -356,7 +356,7 @@ std::unique_ptr create_cl_rgb_to_yuv_operation(const ColorspaceDefini - { - zassert_d(in.primaries == out.primaries, "primaries mismatch"); - zassert_d(in.matrix == MatrixCoefficients::RGB && in.transfer == TransferCharacteristics::LINEAR, "must be linear RGB"); -- zassert_d(out.matrix == MatrixCoefficients::REC_2020_CL && out.transfer == TransferCharacteristics::REC_709, "must be 2020 CL"); -+ zassert_d((out.matrix == MatrixCoefficients::REC_2020_CL || out.matrix == MatrixCoefficients::CHROMATICITY_DERIVED_CL) && out.transfer == TransferCharacteristics::REC_709, "must be 2020 CL"); - - // CL is always scene-referred. - TransferFunction func = select_transfer_function(out.transfer, params.peak_luminance, true); --- -2.25.1 - diff --git a/update-matrix3.cpp.patch b/update-matrix3.cpp.patch deleted file mode 100644 index 8ccb542..0000000 --- a/update-matrix3.cpp.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9ae36d7d5f7420eaacd9644451933512fa13d716 Mon Sep 17 00:00:00 2001 -From: sekrit-twc -Date: Wed, 4 Dec 2019 12:01:26 -0800 -Subject: [PATCH] Update matrix3.cpp - ---- - src/zimg/colorspace/matrix3.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/zimg/colorspace/matrix3.cpp b/src/zimg/colorspace/matrix3.cpp -index 06e0e2f..b4aeea7 100644 ---- a/src/zimg/colorspace/matrix3.cpp -+++ b/src/zimg/colorspace/matrix3.cpp -@@ -1,3 +1,4 @@ -+#include - #include "matrix3.h" - - namespace zimg { --- -2.24.0 - diff --git a/zimg-2.9.3.obscpio b/zimg-2.9.3.obscpio deleted file mode 100644 index 5199278..0000000 --- a/zimg-2.9.3.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f571d6f0d4063707db7c9ba48faf5c6b54cd8dcbe32776567a5915cc1316461b -size 6437901 diff --git a/zimg-3.0.obscpio b/zimg-3.0.obscpio new file mode 100644 index 0000000..e851634 --- /dev/null +++ b/zimg-3.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f427667796c7c9574eb2f6c03182abda76376835da78a37615061acf83a8d3d4 +size 6153229 diff --git a/zimg.changes b/zimg.changes index 1dd59c5..f962fd3 100644 --- a/zimg.changes +++ b/zimg.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Aug 5 00:53:05 UTC 2020 - Mia Herkt + +- Update to version 3.0 (API 2.4): + * api: support alpha channel as the fourth plane + * colorspace: accept UNSPECIFIED transfer characteristics in + more situations + * colorspace: fix conversion from ICtCp to ARIB STD-B67 + * depth: fix out of bounds access in SSE2 ordered dither + * graph: rewrite for alpha channel support + * resize: fix incorrect rounding when calculating pixel + coordinates + * resize: AVX-512 VNNI code paths + * arm: NEON/ASIMD code paths +- Drop patches: + * update-matrix3.cpp.patch + * colorspace-fix-assertion.patch + * colorspace-fix-assertion-part2.patch + ------------------------------------------------------------------- Wed Mar 18 08:15:32 UTC 2020 - Martin Liška diff --git a/zimg.obsinfo b/zimg.obsinfo index fa77514..8ef2ee3 100644 --- a/zimg.obsinfo +++ b/zimg.obsinfo @@ -1,5 +1,5 @@ name: zimg -version: 2.9.3 -mtime: 1583124602 -commit: 527dd55fd5221bd223bf019456da215759073c6f +version: 3.0 +mtime: 1596493487 +commit: a91c96aba15d4a255fe4187f1f0c2364dd2da98e diff --git a/zimg.spec b/zimg.spec index 38a274c..edff2d2 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,7 +1,7 @@ # # spec file for package zimg # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define sover 2 Name: zimg -Version: 2.9.3 +Version: 3.0 Release: 0 Summary: Scaling, colorspace conversion, and dithering library License: WTFPL @@ -26,11 +26,9 @@ Group: Development/Libraries/C and C++ URL: https://github.com/sekrit-twc/zimg Source0: zimg-%{version}.tar.xz Source99: baselibs.conf -Patch0: update-matrix3.cpp.patch -Patch1: colorspace-fix-assertion.patch -Patch2: colorspace-fix-assertion-part2.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig @@ -58,9 +56,6 @@ developing applications that use libzimg%{sover}. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build autoreconf -fiv @@ -71,7 +66,7 @@ autoreconf -fiv --enable-x86simd \ %endif --disable-static -make %{?_smp_mflags} V=1 +%make_build %install %make_install @@ -81,15 +76,15 @@ find %{buildroot} -type f -name "*.la" -delete -print # test suite is broken on other platforms, upstream informed %ifarch x86_64 %check -make clean +%make_build clean %configure \ %ifarch x86_64 %{ix86} --enable-x86simd \ %endif --disable-static \ --enable-unit-test -make %{?_smp_mflags} V=1 -make %{?_smp_mflags} V=1 test/unit_test +%make_build +%make_build test/unit_test test/unit_test %endif From 388c495b81eb824de14d6e667569c3eb9990fdc6f3a7085b50e64df17eb0e9b1 Mon Sep 17 00:00:00 2001 From: Mia Herkt Date: Wed, 5 Aug 2020 01:07:31 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/zimg?expand=0&rev=29 --- zimg.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/zimg.spec b/zimg.spec index edff2d2..fbf7fff 100644 --- a/zimg.spec +++ b/zimg.spec @@ -62,9 +62,6 @@ autoreconf -fiv # do not enable tests here — they make zimg slower and the install # rule is broken %configure \ - %ifarch x86_64 %{ix86} - --enable-x86simd \ - %endif --disable-static %make_build @@ -78,9 +75,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %check %make_build clean %configure \ - %ifarch x86_64 %{ix86} - --enable-x86simd \ - %endif --disable-static \ --enable-unit-test %make_build From 7005908ef2c16e7e402de3ab9fbb480ef2f5ea733484509cd6f5de13994d532d Mon Sep 17 00:00:00 2001 From: Mia Herkt Date: Wed, 5 Aug 2020 01:07:59 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/zimg?expand=0&rev=30 --- zimg.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/zimg.spec b/zimg.spec index fbf7fff..2298b0a 100644 --- a/zimg.spec +++ b/zimg.spec @@ -70,8 +70,6 @@ autoreconf -fiv rm -rf %{buildroot}%{_datadir}/doc/zimg find %{buildroot} -type f -name "*.la" -delete -print -# test suite is broken on other platforms, upstream informed -%ifarch x86_64 %check %make_build clean %configure \ @@ -80,7 +78,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %make_build %make_build test/unit_test test/unit_test -%endif %post -n libzimg%{sover} -p /sbin/ldconfig %postun -n libzimg%{sover} -p /sbin/ldconfig From a7e352158254f2c03fd3dfac8e1a1de15897f63ea10eb659076996a87879d5a1 Mon Sep 17 00:00:00 2001 From: Mia Herkt Date: Wed, 5 Aug 2020 05:35:33 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/zimg?expand=0&rev=31 --- zimg.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/zimg.spec b/zimg.spec index 2298b0a..7100633 100644 --- a/zimg.spec +++ b/zimg.spec @@ -62,6 +62,9 @@ autoreconf -fiv # do not enable tests here — they make zimg slower and the install # rule is broken %configure \ +%ifarch armv7l + --disable-simd \ +%endif --disable-static %make_build @@ -70,14 +73,19 @@ autoreconf -fiv rm -rf %{buildroot}%{_datadir}/doc/zimg find %{buildroot} -type f -name "*.la" -delete -print +%ifnarch ppc64 ppc64le %check %make_build clean %configure \ +%ifarch armv7l + --disable-simd \ +%endif --disable-static \ --enable-unit-test %make_build %make_build test/unit_test test/unit_test +%endif %post -n libzimg%{sover} -p /sbin/ldconfig %postun -n libzimg%{sover} -p /sbin/ldconfig From e89c29c5aea9d3aa3596fea4e85a6c3ce4334fc9fcd623685292175173cced1a Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 23 Sep 2020 13:19:51 +0000 Subject: [PATCH 5/5] Accepting request 833556 from home:dirkmueller:branches:multimedia:libs - update to 3.0.1: * graph: fix handling of default nominal_peak_luminance (introduced in 3.0) OBS-URL: https://build.opensuse.org/request/show/833556 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/zimg?expand=0&rev=32 --- _service | 2 +- zimg-3.0.1.obscpio | 3 +++ zimg-3.0.obscpio | 3 --- zimg.changes | 6 ++++++ zimg.obsinfo | 6 +++--- zimg.spec | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 zimg-3.0.1.obscpio delete mode 100644 zimg-3.0.obscpio diff --git a/_service b/_service index cf19cd7..cbcbf68 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git @PARENT_TAG@ release([0-9\.]*) - release-3.0 + release-3.0.1 diff --git a/zimg-3.0.1.obscpio b/zimg-3.0.1.obscpio new file mode 100644 index 0000000..b781a36 --- /dev/null +++ b/zimg-3.0.1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbc514a114145d2cb895463c4eb046329f77da26df5758875144d95d1209f603 +size 6154765 diff --git a/zimg-3.0.obscpio b/zimg-3.0.obscpio deleted file mode 100644 index e851634..0000000 --- a/zimg-3.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f427667796c7c9574eb2f6c03182abda76376835da78a37615061acf83a8d3d4 -size 6153229 diff --git a/zimg.changes b/zimg.changes index f962fd3..ab98d3b 100644 --- a/zimg.changes +++ b/zimg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 10 17:43:22 UTC 2020 - Dirk Mueller + +- update to 3.0.1: + * graph: fix handling of default nominal_peak_luminance (introduced in 3.0) + ------------------------------------------------------------------- Wed Aug 5 00:53:05 UTC 2020 - Mia Herkt diff --git a/zimg.obsinfo b/zimg.obsinfo index 8ef2ee3..11c4c4a 100644 --- a/zimg.obsinfo +++ b/zimg.obsinfo @@ -1,5 +1,5 @@ name: zimg -version: 3.0 -mtime: 1596493487 -commit: a91c96aba15d4a255fe4187f1f0c2364dd2da98e +version: 3.0.1 +mtime: 1598190477 +commit: e17ee6cf72509c32c15067b32615849e69486367 diff --git a/zimg.spec b/zimg.spec index 7100633..2b78f40 100644 --- a/zimg.spec +++ b/zimg.spec @@ -18,7 +18,7 @@ %define sover 2 Name: zimg -Version: 3.0 +Version: 3.0.1 Release: 0 Summary: Scaling, colorspace conversion, and dithering library License: WTFPL