gentoo auto-resync : 16:10:2022 - 13:52:51

5 files changed, 71 insertions, 1 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 22e742eae56b..49a73fe6dba4 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index ad639f236450..e976f136326c 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,7 @@
+AUX kimageformats-5.99.0-avif-perf-1.patch 932 BLAKE2B 7ba0835e0c21fc65450e8495a209bf11741173dfa147ac9de5cca820e7317960dd98bbf511eec1f9589939db8217581c788084e31e164dd7db41466de9d048bf SHA512 7d35cd83f964ed8bc21d8bec7385dae5f7e822e0f446087d04b1d5da168d7de1815c000479f512bba906ae7087b1a5fb34b5820583cbe9bec12eb724c0bd6133
+AUX kimageformats-5.99.0-avif-perf-2.patch 931 BLAKE2B aee4fe26f92a816a484faa25f43c866dcadb003d374364990ea075587f97d09f7b9d6f0cc07b0ad86958d3bd64442a16d74d2660d97f94b7aedd27d867aed759 SHA512 8b007bd6d9a5ba59f8e4ca764849eccd6c92cb3a84a1bf84204bfc2b759c604cb1322f0110b98a9d6dbc75d67c6819c4b90da65f259b6448ec4e1fac12ce4952
 DIST kimageformats-5.96.0.tar.xz 3589112 BLAKE2B 2a9e5f72b09e27ebb561013f816b41e9ef8be9d874074ddd014f631a57f0da79cc2785d3d528f9ea9f76b940075f0f7649aca57c8ff20a376f5ffa3adea80eb1 SHA512 37e51279824df05391647d45125676127d5570d4ed0905d2378dd627c3542d61f6f43bdd4e6f28ef43268127d120c1d2829a5cba34dde1ba7427b9051d241c1c
 DIST kimageformats-5.99.0.tar.xz 12298368 BLAKE2B e1ae582992368031212699598b2a38a1010c08d89ca963bda0c39a0bbf954c88efa7ad4fc88019fea68afb328d624667188d82fee4317f4b893a234e66d640c5 SHA512 e6e456915d2ec0f9ef16400b4bb299fda7eaf28d8c66ef8e91fc700a711c65313785b8de64a310031ab362f507ef72922d7769bee232862e25ee8f4d44f45476
 EBUILD kimageformats-5.96.0.ebuild 1008 BLAKE2B 881d5e6493a719ba5ab913e114d77bc46fe3c82cb655d1a47db14ab0eb2398cd2d6e4b283c0358dc65076d796ebf3e576155fff28be12f65b9aa3ae0710a9af1 SHA512 bb6b63276e7a97e0aef3cd4f8a83be1e600b4cd793501bcac42559cf00bf3c6b3f4f47163c0718c22a91373dccf5f7dce833f79c699315a2763bc09c2a139bfa
-EBUILD kimageformats-5.99.0.ebuild 1084 BLAKE2B 9fcdd461cd9e8ec6797f8210fc7e0c646ebb2bc814228860673fde22674ad9eeaa00393819df9a50e77767e2262b8598f0146bcb0d0838193ad85271d664ca07 SHA512 04fc590115b7fe91297054bdbd9a48210359157f15bb9ecd402dbeb5227789c89abb85495eb85fe169c6d69c88c20e62d4a4a3d46271ff2ede49f2be24aadd7a
+EBUILD kimageformats-5.99.0-r1.ebuild 1138 BLAKE2B 74a8a4bd5b1923ab499941e5f4ad628c45599390e9564076af2d9729de6c9de5b87a7f4976f8ff14c3ae1f2cf01336801ee81d6735b51f307f394846ab823b1c SHA512 bb2d047ce581a58dfe611b5548d5553c42c385462a07d59bda9a18d9b4560da3b1dcb045e4969bff6664f6a2c6b8562453a20f018a2c352a3a6edd2821f09541
 MISC metadata.xml 775 BLAKE2B 7a31e17d20aaa7fb530e76ff4cac8f681f81d1229ed6c0b08206de919be074a3fa9667ff7f24c9db674a6950de938b7bddb609cb5c015f1b7072fbd981b56e1a SHA512 80aee93fef37b1ef9a81dba5c77934ec269d44a0016c31b4cd2d855edd607894267ad7c0e39cf795b212b200f433611fc9c7014a97df784879717a46d33ff62a
diff --git a/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-1.patch b/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-1.patch
new file mode 100644
index 000000000000..326ce2fd9e47
--- /dev/null
+++ b/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-1.patch
@@ -0,0 +1,34 @@
+From 350ce1b990460cb2178f369f22fe80803f5645f3 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Sat, 15 Oct 2022 11:40:41 +0800
+Subject: [PATCH] avif: return `false` in `canRead()` when `imageIndex >=
+ imageCount`
+
+Otherwise when `cache: false` is set in AnimatedImage, QMovie will try
+to read the image forever.
+
+BUG: 460085
+FIXED-IN: 5.100
+---
+ src/imageformats/avif.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/imageformats/avif.cpp b/src/imageformats/avif.cpp
+index 2865a4e..c4f7a0f 100644
+--- a/src/imageformats/avif.cpp
++++ b/src/imageformats/avif.cpp
+@@ -42,6 +42,11 @@ bool QAVIFHandler::canRead() const
+ 
+     if (m_parseState != ParseAvifError) {
+         setFormat("avif");
++
++        if (m_parseState == ParseAvifSuccess && m_decoder->imageIndex >= m_decoder->imageCount - 1) {
++            return false;
++        }
++
+         return true;
+     }
+     return false;
+-- 
+GitLab
+
diff --git a/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-2.patch b/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-2.patch
new file mode 100644
index 000000000000..8e7763b2c580
--- /dev/null
+++ b/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-2.patch
@@ -0,0 +1,32 @@
+From 1190e53e9b69da6f9663ceb75c4813c5708b7cbd Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Sat, 15 Oct 2022 14:11:56 +0800
+Subject: [PATCH] avif: always indicate endless loop
+
+avif does not support loops but endless loop was the behavior before
+460085 was fixed, so a workaround is added.
+
+See also: https://github.com/AOMediaCodec/libavif/issues/347
+
+CCBUG: 460085
+---
+ src/imageformats/avif.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/imageformats/avif.cpp b/src/imageformats/avif.cpp
+index c4f7a0f..24aec84 100644
+--- a/src/imageformats/avif.cpp
++++ b/src/imageformats/avif.cpp
+@@ -1024,7 +1024,8 @@ int QAVIFHandler::loopCount() const
+         return 0;
+     }
+ 
+-    return 1;
++    // Endless loop to work around https://github.com/AOMediaCodec/libavif/issues/347
++    return -1;
+ }
+ 
+ QPointF QAVIFHandler::CompatibleChromacity(qreal chrX, qreal chrY)
+-- 
+GitLab
+
diff --git a/kde-frameworks/kimageformats/kimageformats-5.99.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.99.0-r1.ebuild
index 9721b97462eb..776f0af5e0b7 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.99.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.99.0-r1.ebuild
@@ -29,6 +29,8 @@ RDEPEND="${DEPEND}"
 
 DOCS=( src/imageformats/AUTHORS )
 
+PATCHES=( "${FILESDIR}"/${P}-avif-perf-{1,2}.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DKIMAGEFORMATS_JXL=$(usex jpegxl)