From 1aa99ecc93a15a428a88197dd05d97bcd33102b7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 19 Feb 2023 02:12:45 +0000 Subject: gentoo auto-resync : 19:02:2023 - 02:12:45 --- kde-frameworks/kimageformats/Manifest | 7 -- .../files/kimageformats-5.99.0-avif-0.11.0.patch | 51 --------- .../files/kimageformats-5.99.0-avif-perf-1.patch | 34 ------ .../files/kimageformats-5.99.0-avif-perf-2.patch | 32 ------ .../files/kimageformats-5.99.0-avif-perf-3.patch | 70 ------------- .../files/kimageformats-5.99.0-jxl-perf.patch | 116 --------------------- .../kimageformats/kimageformats-5.99.0-r3.ebuild | 50 --------- 7 files changed, 360 deletions(-) delete mode 100644 kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-0.11.0.patch delete mode 100644 kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-1.patch delete mode 100644 kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-2.patch delete mode 100644 kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-3.patch delete mode 100644 kde-frameworks/kimageformats/files/kimageformats-5.99.0-jxl-perf.patch delete mode 100644 kde-frameworks/kimageformats/kimageformats-5.99.0-r3.ebuild (limited to 'kde-frameworks/kimageformats') diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest index 8bfa7ca0556a..dd7fd5681e42 100644 --- a/kde-frameworks/kimageformats/Manifest +++ b/kde-frameworks/kimageformats/Manifest @@ -1,13 +1,6 @@ AUX kimageformats-5.102.0-heif-reject-invalid-files-w-0-size.patch 1061 BLAKE2B 49e8ccf7df639011c61b6c58fefcac7ad90d757eb635565f9f05b68dfe012b9a71ee3bde7ebac931ac786cf8fb32cc52fed7044e7f827dbd6efd625ea5a846c7 SHA512 329154479487c1d7656be8227bcf0bc6dc1617810ee2fa4a43428512b853b1d008f0686e1466c01a7d14487254213489923182446a750a213e0c0480481a6f1c -AUX kimageformats-5.99.0-avif-0.11.0.patch 1916 BLAKE2B eacae65d69c93e4d4f5f5444e9ee375c2f82decfe3970f5a456035ab71751f9ed44eddaa69f5fbe99929407823d983a4e63097df8e705d754b7a5b445ad1f8fe SHA512 b990477ada4cc57ec0aa12f531283603825f10a5023834910b4758b9e4ab26075c0e0757817334318d59e4946a93a4ba808878470705810d8224729210c04091 -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 -AUX kimageformats-5.99.0-avif-perf-3.patch 2384 BLAKE2B 4dcf3b0a1d0300d55b87829dc81109eca3626a499ca81182b23b59e9031f929af727bdf86f984bcee0ffa02dd7b60a2bfab4fc8d2f59abeb37e23eb91741d83b SHA512 7876246e20a8c1203b780f7a0566508801e8cb8ad04059202090559ca8968ac6e4185a458ad67c7a575aa896d001b1eb0aec44c737bd4ba829a6665abdaa7713 -AUX kimageformats-5.99.0-jxl-perf.patch 3437 BLAKE2B 2db2debc1ce40682d310d0fc4c84f29a7f745ec010ca35e07684e221a9d586d2ced559f89ca2d719a2b99cf7d0917678d3b5ca735a75f5794e853d02072dfcde SHA512 3c2033e0d28da88d13b032d84959f49b98cc4677bbd42e5794b0e48a16f8a456569aeebe06a38ff7b5cb1ed3dc0c6fb11ecff7a734c9c94c549a7ee7a9166505 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 EBUILD kimageformats-5.102.0-r1.ebuild 1209 BLAKE2B 83b73ffef84040b78aea5ddb994f2b3b93b0208880a6def8545bd0016f0faab2ab37f817b79b2e1dd4b8eb42d588607ec75dba3b35abdf343d211a6138e59e8e SHA512 adfdd4b1be49deaed915618a51cb7d15509dc3ee8cd99399f118854529198da7cec6416a482e08a70edb772f9be4a1065c588e02a5563b4cfbca78bbc1e8af7d EBUILD kimageformats-5.103.0.ebuild 1139 BLAKE2B 24da9903922685e1764be620c2849d6ef49bde91265b0c071ec170f303fee81aaba6abc29ee7a0cc3a3a84f2062c68591e63c3cc7c4469bc0733da21febd26ec SHA512 ccd68c636c098557036d3b6c071105ec2ab2f97eb6299dd8c631123b3a088252374b0155f67fcd070d4a2f866c6d7d03c74507e0a1427f6291788fb448708bb8 -EBUILD kimageformats-5.99.0-r3.ebuild 1259 BLAKE2B 580b38452cb82ecf40d349f87199bac9250d0a294e9ad81f9819e813ca4d31dc62bafd400363d0b2434ac565878566d82cd0184d33a1b0a689e02631196abdde SHA512 08ad2494165412af68328fef2ff75c8b9c39ddb854a3b30869756081a42b096502a50d38d0fad3ad5e02d376fb15b7954bfdb8bb926b4011fec0200da321d6ba MISC metadata.xml 719 BLAKE2B f87d63a81cb7e008eed6141a6436eb8dbef4f47c614ad950f5cf4b73b13eb79d496bb64bf64b2b7a1ab7ef5879aa6148acc167e18976dc52f77344e72a9c3040 SHA512 fbd11e370afc821a8ef5a809d9436201f6b679c37651fbc2d7f74ab701d85d369f27740b6253800efa60332f6eeab323973f1007de07cb81b0f9f11c6b0b1fd4 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?= -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 -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 -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?= -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?= -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 deleted file mode 100644 index ccd14d36bb7c..000000000000 --- a/kde-frameworks/kimageformats/kimageformats-5.99.0-r3.ebuild +++ /dev/null @@ -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 -} -- cgit v1.2.3