gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

kde-frameworks/kimageformats: drop 5.99.0-r3

Browse Source 
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2023-02-14 20:20:11 +01:00
parent d386fc1c48
commit 0e189a6f2f
7 changed files with 0 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kde-frameworks/kimageformats/Manifest
View File

@@ -1,3 +1,2 @@
DIST kimageformats-5.102.0.tar.xz 12971408 BLAKE2B 2e16e90b327c37e78874b144e25d8cb64f972397baa23a0e1e6179eda0180b79b634cf744350b9631011aba2ae1e2c6b2b8ade9988d9cdfb32ea7cb8694cde3a SHA512 2582631b36e22ec6440cff6e6ba052cfca158331317e13f47c781486a824b2f6a8b44c6b715ced35e9087b0a649a87627ac3e72e0be0694d4e25fcaebcbacbb4
DIST kimageformats-5.103.0.tar.xz 12971556 BLAKE2B 1f9506f77e700652f2fd0a2ada61ba69286f633ffb74895f972be1383fde11e13806facde348bfb74d6d73579f8b85c6ea4aa7772945d98b56754f5d3405c0ab SHA512 7553a782a8acc07d1408d9d35c95592ab4ef8b4dd69f842d9fad3795e49038ddf496b871e917ceda7ea4972f92410a8b69bc853e61085c5f86f951251907e490
DIST kimageformats-5.99.0.tar.xz 12298368 BLAKE2B e1ae582992368031212699598b2a38a1010c08d89ca963bda0c39a0bbf954c88efa7ad4fc88019fea68afb328d624667188d82fee4317f4b893a234e66d640c5 SHA512 e6e456915d2ec0f9ef16400b4bb299fda7eaf28d8c66ef8e91fc700a711c65313785b8de64a310031ab362f507ef72922d7769bee232862e25ee8f4d44f45476

51
kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-0.11.0.patch
View File

@@ -1,51 +0,0 @@
From f475a4b24a166d7582163753bc2f4f254257daed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
Date: Tue, 11 Oct 2022 14:36:17 +0200
Subject: [PATCH] avif: revert 9ac923ad09316dcca0fc11e0be6b3dfc6cce6ca0 commit
Changes to libavif's avifImageRGBToYUV() API were reverted too.
---
src/imageformats/avif.cpp | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/imageformats/avif.cpp b/src/imageformats/avif.cpp
index ccb4c56..7721c1b 100644
--- a/src/imageformats/avif.cpp
+++ b/src/imageformats/avif.cpp
@@ -336,7 +336,7 @@ bool QAVIFHandler::decode_one_frame()
rgb.format = AVIF_RGB_FORMAT_ARGB;
#endif
-#if (AVIF_VERSION >= 80400) && (AVIF_VERSION <= 100100)
+#if AVIF_VERSION >= 80400
if (m_decoder->imageCount > 1) {
/* accelerate animated AVIF */
rgb.chromaUpsampling = AVIF_CHROMA_UPSAMPLING_FASTEST;
@@ -351,12 +351,7 @@ bool QAVIFHandler::decode_one_frame()
rgb.rowBytes = result.bytesPerLine();
rgb.pixels = result.bits();
-#if AVIF_VERSION >= 100101
- // use faster decoding for animations
- avifResult res = avifImageYUVToRGB(m_decoder->image, &rgb, (m_decoder->imageCount > 1) ? AVIF_CHROMA_UPSAMPLING_NEAREST : AVIF_YUV_TO_RGB_DEFAULT);
-#else
avifResult res = avifImageYUVToRGB(m_decoder->image, &rgb);
-#endif
if (res != AVIF_RESULT_OK) {
qWarning("ERROR in avifImageYUVToRGB: %s", avifResultToString(res));
return false;
@@ -782,11 +777,7 @@ bool QAVIFHandler::write(const QImage &image)
}
}
-#if AVIF_VERSION >= 100101
- res = avifImageRGBToYUV(avif, &rgb, AVIF_RGB_TO_YUV_DEFAULT);
-#else
res = avifImageRGBToYUV(avif, &rgb);
-#endif
if (res != AVIF_RESULT_OK) {
qWarning("ERROR in avifImageRGBToYUV: %s", avifResultToString(res));
return false;
--
GitLab

34
kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-1.patch
View File

@@ -1,34 +0,0 @@
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

32
kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-2.patch
View File

@@ -1,32 +0,0 @@
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

70
kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-3.patch
View File

@@ -1,70 +0,0 @@
From bfb12093ad7a0624aa0b779bacf1377bd86c551d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
Date: Sat, 15 Oct 2022 20:03:56 +0200
Subject: [PATCH] avif: indicate when all frames have been read
---
src/imageformats/avif.cpp | 13 ++++++++++---
src/imageformats/avif_p.h | 1 +
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/imageformats/avif.cpp b/src/imageformats/avif.cpp
index 24aec84..cd3a08b 100644
--- a/src/imageformats/avif.cpp
+++ b/src/imageformats/avif.cpp
@@ -43,7 +43,7 @@ bool QAVIFHandler::canRead() const
if (m_parseState != ParseAvifError) {
setFormat("avif");
- if (m_parseState == ParseAvifSuccess && m_decoder->imageIndex >= m_decoder->imageCount - 1) {
+ if (m_parseState == ParseAvifFinished) {
return false;
}
@@ -74,7 +74,7 @@ bool QAVIFHandler::canRead(QIODevice *device)
bool QAVIFHandler::ensureParsed() const
{
- if (m_parseState == ParseAvifSuccess || m_parseState == ParseAvifMetadata) {
+ if (m_parseState == ParseAvifSuccess || m_parseState == ParseAvifMetadata || m_parseState == ParseAvifFinished) {
return true;
}
if (m_parseState == ParseAvifError) {
@@ -88,7 +88,7 @@ bool QAVIFHandler::ensureParsed() const
bool QAVIFHandler::ensureOpened() const
{
- if (m_parseState == ParseAvifSuccess) {
+ if (m_parseState == ParseAvifSuccess || m_parseState == ParseAvifFinished) {
return true;
}
if (m_parseState == ParseAvifError) {
@@ -459,6 +459,13 @@ bool QAVIFHandler::read(QImage *image)
*image = m_current_image;
if (imageCount() >= 2) {
m_must_jump_to_next_image = true;
+ if (m_decoder->imageIndex >= m_decoder->imageCount - 1) {
+ // all frames in animation have been read
+ m_parseState = ParseAvifFinished;
+ }
+ } else {
+ // the static image has been read
+ m_parseState = ParseAvifFinished;
}
return true;
}
diff --git a/src/imageformats/avif_p.h b/src/imageformats/avif_p.h
index 83fb547..46156bd 100644
--- a/src/imageformats/avif_p.h
+++ b/src/imageformats/avif_p.h
@@ -55,6 +55,7 @@ private:
ParseAvifNotParsed = 0,
ParseAvifSuccess = 1,
ParseAvifMetadata = 2,
+ ParseAvifFinished = 3,
};
ParseAvifState m_parseState;
--
GitLab

116
kde-frameworks/kimageformats/files/kimageformats-5.99.0-jxl-perf.patch
View File

@@ -1,116 +0,0 @@
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

50
kde-frameworks/kimageformats/kimageformats-5.99.0-r3.ebuild
View File

@@ -1,50 +0,0 @@
# 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"
RDEPEND="
>=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:= )
"
DEPEND="${RDEPEND}
test? ( heif? ( media-libs/libheif[x265] ) )
"
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
}