Accepting request 836326 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/836326
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zimg?expand=0&rev=36

_service

@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">release([0-9\.]*)</param>
-    <param name="revision">release-2.9.3</param>
+    <param name="revision">release-3.0.1</param>
   </service>
   <service name="tar" mode="buildtime" />
   <service name="recompress" mode="buildtime">

colorspace-fix-assertion-part2.patch

@@ -1,36 +0,0 @@
-From bb17c9433bfdc78e296982aad32981bcb9d5514c Mon Sep 17 00:00:00 2001
-From: sekrit-twc <noreply@example.com>
-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<Operation> create_lms_to_ictcp_operation(const ColorspaceDefinit
- std::unique_ptr<Operation> create_gamma_to_linear_operation(const ColorspaceDefinition &in, const ColorspaceDefinition &out, const OperationParams &params, 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<Operation> create_gamma_to_linear_operation(const ColorspaceDefi
- std::unique_ptr<Operation> create_linear_to_gamma_operation(const ColorspaceDefinition &in, const ColorspaceDefinition &out, const OperationParams &params, 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
-

colorspace-fix-assertion.patch

@@ -1,34 +0,0 @@
-From fbd1ecebde3e336ad4f205381867adddfd4f754b Mon Sep 17 00:00:00 2001
-From: sekrit-twc <noreply@example.com>
-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<Operation> create_inverse_arib_b67_operation(const Matrix3x3 &m,
- std::unique_ptr<Operation> create_cl_yuv_to_rgb_operation(const ColorspaceDefinition &in, const ColorspaceDefinition &out, const OperationParams &params, 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<Operation> 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
-

update-matrix3.cpp.patch

@@ -1,21 +0,0 @@
-From 9ae36d7d5f7420eaacd9644451933512fa13d716 Mon Sep 17 00:00:00 2001
-From: sekrit-twc <sekrit-twc@users.noreply.github.com>
-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 <cstddef>
- #include "matrix3.h"
- 
- namespace zimg {
--- 
-2.24.0
-

zimg-2.9.3.obscpio

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

zimg-3.0.1.obscpio

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

zimg.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Thu Sep 10 17:43:22 UTC 2020 - Dirk Mueller <dmueller@suse.com>
+
+- 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 <mia@0x0.st>
+
+- 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 <mliska@suse.cz>
 

zimg.obsinfo

@@ -1,5 +1,5 @@
 name: zimg
-version: 2.9.3
+version: 3.0.1
-mtime: 1583124602
+mtime: 1598190477
-commit: 527dd55fd5221bd223bf019456da215759073c6f
+commit: e17ee6cf72509c32c15067b32615849e69486367
 

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.1
 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,38 +56,34 @@ developing applications that use libzimg%{sover}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 autoreconf -fiv
 # do not enable tests here — they make zimg slower and the install
 # rule is broken
 %configure \
-  %ifarch x86_64 %{ix86}
+%ifarch armv7l
-  --enable-x86simd \
+  --disable-simd \
-  %endif
+%endif
   --disable-static
-make %{?_smp_mflags} V=1
+%make_build
 
 %install
 %make_install
 rm -rf %{buildroot}%{_datadir}/doc/zimg
 find %{buildroot} -type f -name "*.la" -delete -print
 
-# test suite is broken on other platforms, upstream informed
+%ifnarch ppc64 ppc64le
-%ifarch x86_64
 %check
-make clean
+%make_build clean
 %configure \
-  %ifarch x86_64 %{ix86}
+%ifarch armv7l
-  --enable-x86simd \
+  --disable-simd \
-  %endif
+%endif
   --disable-static \
   --enable-unit-test
-make %{?_smp_mflags} V=1
+%make_build
-make %{?_smp_mflags} V=1 test/unit_test
+%make_build test/unit_test
 test/unit_test
 %endif