From 84a400be40cf32d9e536ae34ebf14ad06ad6b8d6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 19 Oct 2022 01:57:29 +0100 Subject: gentoo auto-resync : 19:10:2022 - 01:57:29 --- kde-frameworks/kimageformats/Manifest | 4 +- .../files/kimageformats-5.99.0-avif-0.11.0.patch | 51 ++++++++++++++++ .../files/kimageformats-5.99.0-avif-perf-3.patch | 70 ++++++++++++++++++++++ .../kimageformats/kimageformats-5.99.0-r1.ebuild | 44 -------------- .../kimageformats/kimageformats-5.99.0-r2.ebuild | 47 +++++++++++++++ 5 files changed, 171 insertions(+), 45 deletions(-) create mode 100644 kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-0.11.0.patch create mode 100644 kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-3.patch delete mode 100644 kde-frameworks/kimageformats/kimageformats-5.99.0-r1.ebuild create mode 100644 kde-frameworks/kimageformats/kimageformats-5.99.0-r2.ebuild (limited to 'kde-frameworks/kimageformats') diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest index e976f136326c..94a5ce147cd5 100644 --- a/kde-frameworks/kimageformats/Manifest +++ b/kde-frameworks/kimageformats/Manifest @@ -1,7 +1,9 @@ +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 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-r1.ebuild 1138 BLAKE2B 74a8a4bd5b1923ab499941e5f4ad628c45599390e9564076af2d9729de6c9de5b87a7f4976f8ff14c3ae1f2cf01336801ee81d6735b51f307f394846ab823b1c SHA512 bb2d047ce581a58dfe611b5548d5553c42c385462a07d59bda9a18d9b4560da3b1dcb045e4969bff6664f6a2c6b8562453a20f018a2c352a3a6edd2821f09541 +EBUILD kimageformats-5.99.0-r2.ebuild 1179 BLAKE2B 56b0a96b76f6d55d34cadca83ae78f80fbef1ded0a8e5295feae33d0f1400366795cb4de1dc55408e2876ddcf75d33818cce1cad61e3ef803196ec95e3791342 SHA512 e9796e01a74e67a7db85db0225d2fc1e2e5319db2c861ed64d4487f699da799c47d7e85e8e1ba50bb64d34ed0450773508ee9d1521c3b53dfde8c7541a061bff MISC metadata.xml 775 BLAKE2B 7a31e17d20aaa7fb530e76ff4cac8f681f81d1229ed6c0b08206de919be074a3fa9667ff7f24c9db674a6950de938b7bddb609cb5c015f1b7072fbd981b56e1a SHA512 80aee93fef37b1ef9a81dba5c77934ec269d44a0016c31b4cd2d855edd607894267ad7c0e39cf795b212b200f433611fc9c7014a97df784879717a46d33ff62a 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 new file mode 100644 index 000000000000..8f605331f365 --- /dev/null +++ b/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-0.11.0.patch @@ -0,0 +1,51 @@ +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-3.patch b/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-3.patch new file mode 100644 index 000000000000..1cc9f2f99895 --- /dev/null +++ b/kde-frameworks/kimageformats/files/kimageformats-5.99.0-avif-perf-3.patch @@ -0,0 +1,70 @@ +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/kimageformats-5.99.0-r1.ebuild b/kde-frameworks/kimageformats/kimageformats-5.99.0-r1.ebuild deleted file mode 100644 index 776f0af5e0b7..000000000000 --- a/kde-frameworks/kimageformats/kimageformats-5.99.0-r1.ebuild +++ /dev/null @@ -1,44 +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" - -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 -} diff --git a/kde-frameworks/kimageformats/kimageformats-5.99.0-r2.ebuild b/kde-frameworks/kimageformats/kimageformats-5.99.0-r2.ebuild new file mode 100644 index 000000000000..6be9f5b4f8b1 --- /dev/null +++ b/kde-frameworks/kimageformats/kimageformats-5.99.0-r2.ebuild @@ -0,0 +1,47 @@ +# 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 +) + +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