gentoo auto-resync : 19:02:2023 - 02:12:45

5 files changed, 0 insertions, 303 deletions

diff --git a/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-0.11.0.patch b/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-0.11.0.patch
deleted file mode 100644
index 8f605331f365..000000000000
--- a/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-0.11.0.patch
+++ /dev/null
@@ -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
-
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
deleted file mode 100644
index 326ce2fd9e47..000000000000
--- a/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-1.patch
+++ /dev/null
@@ -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
-
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
deleted file mode 100644
index 8e7763b2c580..000000000000
--- a/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-2.patch
+++ /dev/null
@@ -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
-
diff --git a/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-3.patch b/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-3.patch
deleted file mode 100644
index 1cc9f2f99895..000000000000
--- a/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-3.patch
+++ /dev/null
@@ -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
-
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
deleted file mode 100644
index 7673c8c33653..000000000000
--- a/kde-frameworks/kimageformats/files/kimageformats-5.99.0-jxl-perf.patch
+++ /dev/null
@@ -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
-