* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kimageformats/files/, kde-frameworks/kimageformats/
@ 2022-10-16 9:25 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-10-16 9:25 UTC (permalink / raw
To: gentoo-commits
commit: 485029605884aedb0776bcff066b87a90b896b5b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 09:25:04 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 09:25:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48502960
kde-frameworks/kimageformats: Fix AVIF performance
See also:
https://mail.kde.org/pipermail/distributions/2022-October/001309.html
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kimageformats-5.99.0-avif-perf-1.patch | 34 +++++++++++++++++
.../files/kimageformats-5.99.0-avif-perf-2.patch | 32 ++++++++++++++++
.../kimageformats/kimageformats-5.99.0-r1.ebuild | 44 ++++++++++++++++++++++
3 files changed, 110 insertions(+)
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-r1.ebuild b/kde-frameworks/kimageformats/kimageformats-5.99.0-r1.ebuild
new file mode 100644
index 000000000000..776f0af5e0b7
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.99.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="avif eps heif jpegxl openexr raw"
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ avif? ( >=media-libs/libavif-0.8.2:= )
+ eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
+ heif? ( >=media-libs/libheif-1.10.0:= )
+ jpegxl? ( media-libs/libjxl )
+ openexr? ( >=media-libs/openexr-3:= )
+ raw? ( media-libs/libraw:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+PATCHES=( "${FILESDIR}"/${P}-avif-perf-{1,2}.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIMAGEFORMATS_JXL=$(usex jpegxl)
+ $(cmake_use_find_package avif libavif)
+ $(cmake_use_find_package eps Qt5PrintSupport)
+ -DKIMAGEFORMATS_HEIF=$(usex heif)
+ $(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package raw LibRaw)
+ )
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kimageformats/files/, kde-frameworks/kimageformats/
@ 2022-10-26 9:04 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-10-26 9:04 UTC (permalink / raw
To: gentoo-commits
commit: 5ef4a48f6af400cd2416951cda2611804ee4e7e3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 09:03:15 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 09:04:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef4a48f
kde-frameworks/kimageformats: Backport JXL performance fix
Upstream commit d734f2872745dd1ab5aab9dafb144130d7e9fdcc
Bug: https://bugs.gentoo.org/877501
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kimageformats-5.99.0-jxl-perf.patch | 116 +++++++++++++++++++++
.../kimageformats/kimageformats-5.99.0-r3.ebuild | 48 +++++++++
2 files changed, 164 insertions(+)
diff --git a/kde-frameworks/kimageformats/files/kimageformats-5.99.0-jxl-perf.patch b/kde-frameworks/kimageformats/files/kimageformats-5.99.0-jxl-perf.patch
new file mode 100644
index 000000000000..7673c8c33653
--- /dev/null
+++ b/kde-frameworks/kimageformats/files/kimageformats-5.99.0-jxl-perf.patch
@@ -0,0 +1,116 @@
+From d734f2872745dd1ab5aab9dafb144130d7e9fdcc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
+Date: Tue, 18 Oct 2022 15:20:16 +0200
+Subject: [PATCH] jxl: indicate when all frames have been read
+
+and return correct loop count
+---
+ src/imageformats/jxl.cpp | 23 ++++++++++++++++++++---
+ src/imageformats/jxl_p.h | 1 +
+ 2 files changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/src/imageformats/jxl.cpp b/src/imageformats/jxl.cpp
+index da2cd2e..2501086 100644
+--- a/src/imageformats/jxl.cpp
++++ b/src/imageformats/jxl.cpp
+@@ -48,6 +48,11 @@ bool QJpegXLHandler::canRead() const
+
+ if (m_parseState != ParseJpegXLError) {
+ setFormat("jxl");
++
++ if (m_parseState == ParseJpegXLFinished) {
++ return false;
++ }
++
+ return true;
+ }
+ return false;
+@@ -72,7 +77,7 @@ bool QJpegXLHandler::canRead(QIODevice *device)
+
+ bool QJpegXLHandler::ensureParsed() const
+ {
+- if (m_parseState == ParseJpegXLSuccess || m_parseState == ParseJpegXLBasicInfoParsed) {
++ if (m_parseState == ParseJpegXLSuccess || m_parseState == ParseJpegXLBasicInfoParsed || m_parseState == ParseJpegXLFinished) {
+ return true;
+ }
+ if (m_parseState == ParseJpegXLError) {
+@@ -90,7 +95,7 @@ bool QJpegXLHandler::ensureALLCounted() const
+ return false;
+ }
+
+- if (m_parseState == ParseJpegXLSuccess) {
++ if (m_parseState == ParseJpegXLSuccess || m_parseState == ParseJpegXLFinished) {
+ return true;
+ }
+
+@@ -401,7 +406,15 @@ bool QJpegXLHandler::decode_one_frame()
+ if (!rewind()) {
+ return false;
+ }
++
++ // all frames in animation have been read
++ m_parseState = ParseJpegXLFinished;
++ } else {
++ m_parseState = ParseJpegXLSuccess;
+ }
++ } else {
++ // the static image has been read
++ m_parseState = ParseJpegXLFinished;
+ }
+
+ return true;
+@@ -860,6 +873,7 @@ bool QJpegXLHandler::jumpToNextImage()
+ }
+ }
+
++ m_parseState = ParseJpegXLSuccess;
+ return true;
+ }
+
+@@ -874,12 +888,14 @@ bool QJpegXLHandler::jumpToImage(int imageNumber)
+ }
+
+ if (imageNumber == m_currentimage_index) {
++ m_parseState = ParseJpegXLSuccess;
+ return true;
+ }
+
+ if (imageNumber > m_currentimage_index) {
+ JxlDecoderSkipFrames(m_decoder, imageNumber - m_currentimage_index);
+ m_currentimage_index = imageNumber;
++ m_parseState = ParseJpegXLSuccess;
+ return true;
+ }
+
+@@ -891,6 +907,7 @@ bool QJpegXLHandler::jumpToImage(int imageNumber)
+ JxlDecoderSkipFrames(m_decoder, imageNumber);
+ }
+ m_currentimage_index = imageNumber;
++ m_parseState = ParseJpegXLSuccess;
+ return true;
+ }
+
+@@ -914,7 +931,7 @@ int QJpegXLHandler::loopCount() const
+ }
+
+ if (m_basicinfo.have_animation) {
+- return 1;
++ return (m_basicinfo.animation.num_loops > 0) ? m_basicinfo.animation.num_loops - 1 : -1;
+ } else {
+ return 0;
+ }
+diff --git a/src/imageformats/jxl_p.h b/src/imageformats/jxl_p.h
+index 8339d7e..7a4af0b 100644
+--- a/src/imageformats/jxl_p.h
++++ b/src/imageformats/jxl_p.h
+@@ -57,6 +57,7 @@ private:
+ ParseJpegXLNotParsed = 0,
+ ParseJpegXLSuccess = 1,
+ ParseJpegXLBasicInfoParsed = 2,
++ ParseJpegXLFinished = 3,
+ };
+
+ ParseJpegXLState m_parseState;
+--
+GitLab
+
diff --git a/kde-frameworks/kimageformats/kimageformats-5.99.0-r3.ebuild b/kde-frameworks/kimageformats/kimageformats-5.99.0-r3.ebuild
new file mode 100644
index 000000000000..feebf9696329
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.99.0-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="avif eps heif jpegxl openexr raw"
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ avif? ( >=media-libs/libavif-0.8.2:= )
+ eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
+ heif? ( >=media-libs/libheif-1.10.0:= )
+ jpegxl? ( media-libs/libjxl )
+ openexr? ( >=media-libs/openexr-3:= )
+ raw? ( media-libs/libraw:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-avif-perf-{1,2,3}.patch
+ "${FILESDIR}"/${P}-avif-0.11.0.patch
+ "${FILESDIR}"/${P}-jxl-perf.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIMAGEFORMATS_JXL=$(usex jpegxl)
+ $(cmake_use_find_package avif libavif)
+ $(cmake_use_find_package eps Qt5PrintSupport)
+ -DKIMAGEFORMATS_HEIF=$(usex heif)
+ $(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package raw LibRaw)
+ )
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-26 9:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-26 9:04 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kimageformats/files/, kde-frameworks/kimageformats/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-10-16 9:25 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox