summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-06-12 20:20:47 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-06-12 20:20:47 +0100
commit3d952d0bfe7b386699eb32d1431deb0c538f044d (patch)
tree45d2492f5c659cbb01120d4192c9be34841362bd /media-gfx
parent522b6bf7e1f6133c288b94a77fc5e3d8eef2c179 (diff)
gentoo auto-resync : 12:06:2023 - 20:20:47
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin38013 -> 38003 bytes
-rw-r--r--media-gfx/exiv2/Manifest3
-rw-r--r--media-gfx/exiv2/exiv2-0.27.6.ebuild115
-rw-r--r--media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch69
-rw-r--r--media-gfx/qimgv/Manifest4
-rw-r--r--media-gfx/qimgv/files/qimgv-1.0.2-exiv2-0.28.patch49
-rw-r--r--media-gfx/qimgv/files/qimgv-1.0.2-fix-apng-cannot-play.patch56
-rw-r--r--media-gfx/qimgv/qimgv-1.0.2-r2.ebuild (renamed from media-gfx/qimgv/qimgv-1.0.2-r1.ebuild)14
8 files changed, 114 insertions, 196 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 80b311885689..8a8b528499ac 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 2f6134f76203..3b58b926e086 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,8 +1,5 @@
-AUX exiv2-0.27.6-jxl-mime.patch 2704 BLAKE2B b7d88658863aef95717b917c006b609279b09f808fb415c9c42b648b61403c0b9fa2c4552470d943ea2b03212fa06fb6c6607cf7331ae0a47ad11a1a1b811e08 SHA512 6461be2af1a4e4318da2b2fdd623e0396de4f43a62b20fb58e7ceac1aa3394bf848ab0107c99267324a7a613cc1a46b68e44696dd3af9eb4bb2c9b0d7b3fe988
-DIST exiv2-0.27.6-Source.tar.gz 32280263 BLAKE2B a025452b7e70aef109a2f7831ba5c0528b0cb8fda92e5959a5927abd442d650f8d40cc47f56d8f87508e5f37e8378728f99e3a4fa96e7a0319cb4542659d9a60 SHA512 045d7fb391202b53897336094812600680141a292367a9194e9529bccb8ab54465190ea0f0636970114402a38840b33b2fcf2edf7b6c616f3e585fa295a887a4
DIST exiv2-0.27.7-Source.tar.gz 32290404 BLAKE2B ac83c36dd15c7f6aa2d6607542a12b981d1b58bed671047d3dbfdc9eea64a977630863e4c4abe1e9c2e3e8af05adf6849a05d70e42cde4bb0d6f4a3fbb9b2e49 SHA512 8f12b056439867a05b6dfe4b93a82e02d9e5032554b590e399bcf38d73208a783f8349e66870cc030ad2a47650389d96522b60086b308145121646c9fa93d8ae
DIST exiv2-0.28.0.tar.gz 45138274 BLAKE2B 6ccdc4e6a7dbd4aa2a892e61306f0c63659d804075cae9e771096cfdc21ec0aff0df22232c036551f4e321f497184e7ad100fb9c2011c14cd0315e8118c3e85f SHA512 35e483c6123f099167ed8647fae7c6e5512434c24d0afe684180ba6a5114068d5678280a01c8e6cfee0d1e555e1dc2a1606989d46950ce3ef1a3859caeed4dad
-EBUILD exiv2-0.27.6.ebuild 2852 BLAKE2B cecc5fbd31c7213d0a9feb4974609b08fb5aeb34802b79a1d70a2af1d6ebfd08798a95a942b28a2b10282875688862ec23f989ce2eb697f093fba718a9b69288 SHA512 fb09c7e6171236dc3564289644ad714cdba23d55d59c335675d0089020698cc713d18a387ad25d4b92be92565c320bb1df4b7ff88bf1ab2b4b3b661663e4ba92
EBUILD exiv2-0.27.7.ebuild 2806 BLAKE2B f562fe2587be570e17da851d505c1a3a0dbdd06a800ae9b563375d85e8ee726b984c576875a6f2e215d0097b1846a36155f742e3a770e41873badaad3a5d06ab SHA512 88b0e6b3721916791f91d5028d5b7a237141bf9520750fc33b989072a310cc40a934f8876723db2cc170af32340a0f6376ee58c0bc956a158f0eb945a4cced44
EBUILD exiv2-0.28.0.ebuild 3176 BLAKE2B 4611b54d438ffb9f375f56c3a62938e574304cc0467e5b05a9f03e934adc00db5bd3eef91953cecde97b7a3d37dbef56acbec5a0285b6f99720c5701717c8283 SHA512 88324d792263d8a43d3c329517c73e9dce754c5094dae664f3623b1c500d790684f66c5722940e7650ecc5e75fb897496d6a7fccdef59f0ca32a6914b7606f44
MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e
diff --git a/media-gfx/exiv2/exiv2-0.27.6.ebuild b/media-gfx/exiv2/exiv2-0.27.6.ebuild
deleted file mode 100644
index 6a06383db4a0..000000000000
--- a/media-gfx/exiv2/exiv2-0.27.6.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN^}/${PN}/releases/download/v${PV}/${P}-Source.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
- S="${WORKDIR}/${P}-Source"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://exiv2.org/"
-
-LICENSE="GPL-2"
-# In 0.27.5, ABI seemed to be broken for bmff functions
-SLOT="0/27.5"
-IUSE="+bmff doc examples nls +png test webready +xmp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
- webready? (
- >net-libs/libssh-0.9.1[sftp,${MULTILIB_USEDEP}]
- net-misc/curl[${MULTILIB_USEDEP}]
- )
- xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-DEPEND="${DEPEND}
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- doc? (
- ${PYTHON_DEPS}
- app-doc/doxygen
- dev-libs/libxslt
- media-gfx/graphviz
- virtual/pkgconfig
- )
- nls? ( sys-devel/gettext )
-"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-PATCHES=( "${FILESDIR}"/${P}-jxl-mime.patch )
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # FIXME @upstream:
- einfo "Converting doc/cmd.txt to UTF-8"
- iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
- mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
- cmake_src_prepare
-
- sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_STANDARD=14
- -DEXIV2_BUILD_SAMPLES=NO
- -DEXIV2_ENABLE_NLS=$(usex nls)
- -DEXIV2_ENABLE_PNG=$(usex png)
- -DEXIV2_ENABLE_CURL=$(usex webready)
- -DEXIV2_ENABLE_SSH=$(usex webready)
- -DEXIV2_ENABLE_WEBREADY=$(usex webready)
- -DEXIV2_ENABLE_XMP=$(usex xmp)
- -DEXIV2_ENABLE_BMFF=$(usex bmff)
- $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
- $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
- $(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test))
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
- )
-
- cmake_src_configure
-}
-
-multilib_src_compile() {
- cmake_src_compile
-
- if multilib_is_native_abi; then
- use doc && eninja doc
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- cd "${BUILD_DIR}"/bin || die
- ./unit_tests || die "Failed to run tests"
- fi
-}
-
-multilib_src_install_all() {
- use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-
- if use examples; then
- docinto examples
- dodoc samples/*.cpp
- fi
-}
diff --git a/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch b/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch
deleted file mode 100644
index b23e38736dca..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 8f889c132ec48d8be7e155fc6d84254ffbb527df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= <peter.kovar@reflexion.tv>
-Date: Sun, 1 Aug 2021 13:56:48 +0200
-Subject: [PATCH 1/3] Corrected JPEG XL file type
-
----
- src/bmffimage.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
-index 3d7c23e936..2440b4afd4 100644
---- a/src/bmffimage.cpp
-+++ b/src/bmffimage.cpp
-@@ -56,7 +56,8 @@
- #define TAG_heix 0x68656978 /**< "heix" HEIC */
- #define TAG_mif1 0x6d696631 /**< "mif1" HEIF */
- #define TAG_crx 0x63727820 /**< "crx " Canon CR3 */
--#define TAG_jxl 0x4a584c20 /**< "JXL " JPEG XL */
-+#define TAG_JXL 0x4a584c20 /**< "JXL " JPEG XL */
-+#define TAG_jxl 0x6a786c20 /**< "jxl " JPEG XL file type */
- #define TAG_moov 0x6d6f6f76 /**< "moov" Movie */
- #define TAG_meta 0x6d657461 /**< "meta" Metadata */
- #define TAG_mdat 0x6d646174 /**< "mdat" Media data */
-
-From 1d095cf75132e548213d740efc402b77178b2add Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= <peter.kovar@reflexion.tv>
-Date: Thu, 5 Aug 2021 10:04:51 +0200
-Subject: [PATCH 2/3] Removed tag handled separately
-
----
- src/bmffimage.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
-index 2440b4afd4..9964a42bc2 100644
---- a/src/bmffimage.cpp
-+++ b/src/bmffimage.cpp
-@@ -56,7 +56,6 @@
- #define TAG_heix 0x68656978 /**< "heix" HEIC */
- #define TAG_mif1 0x6d696631 /**< "mif1" HEIF */
- #define TAG_crx 0x63727820 /**< "crx " Canon CR3 */
--#define TAG_JXL 0x4a584c20 /**< "JXL " JPEG XL */
- #define TAG_jxl 0x6a786c20 /**< "jxl " JPEG XL file type */
- #define TAG_moov 0x6d6f6f76 /**< "moov" Movie */
- #define TAG_meta 0x6d657461 /**< "meta" Metadata */
-
-From af0954ca0cce961d9ea95e728d964f0717d34bfd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
- <miloskomarcevic@aim.com>
-Date: Thu, 12 Aug 2021 16:19:06 +0200
-Subject: [PATCH 3/3] Update test for image/jxl
-
----
- tests/bugfixes/github/test_issue_1503.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/bugfixes/github/test_issue_1503.py b/tests/bugfixes/github/test_issue_1503.py
-index 51c0769135..3f88d26805 100644
---- a/tests/bugfixes/github/test_issue_1503.py
-+++ b/tests/bugfixes/github/test_issue_1503.py
-@@ -33,7 +33,7 @@ class issue_1503_jxl_bmff(metaclass=system_tests.CaseMeta):
- Xmp.photoshop.DateCreated XmpText 10 2004-06-21
- ""","""File name : $filename
- File size : 32892 Bytes
--MIME type : image/generic
-+MIME type : image/jxl
- Image size : 200 x 130
- Thumbnail : image/jpeg, 4196 Bytes
- Camera make : NIKON CORPORATION
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index 83826b2467a3..1fe7a157c0f1 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,4 +1,6 @@
+AUX qimgv-1.0.2-exiv2-0.28.patch 1832 BLAKE2B 4f3188ba0d9de69ea599dd9b6a4f550b07ca6caf45958c7e8ccb62eea9e88fe485f2c79dc64c0977c954fd99d057fd28ce0d509941c29597c1949510049db719 SHA512 3c425c9447f0e96f7259a51d08a8733ae01be915fc9bbcaa3bda5b0682f76054aa4abf2d137263cb1bc21e09d556f2e0c89ff2afb49b1c0ddb32265fdb4f4cc9
+AUX qimgv-1.0.2-fix-apng-cannot-play.patch 1788 BLAKE2B 8593ab5bb4d9e4aaf3607abfc5c5602fdb8d116459f1ce3427ec289a509f93faf46066c663dbc99c5c49317e4c07b62740ffb62d1edd2c6679402536d71bac7d SHA512 2d7aec4742bd4dba8e3e41bef779b810ad2ef626efe950ed2abcb46a64e2fbe4beea02d249a1993672a18ba9c854e12df08ad85b7ac77999edeeff7da1e6bd88
AUX qimgv-1.0.2-libmpv-api2.patch 724 BLAKE2B 175b85d38ea0299efb6a87d397a73d2fd85ac85990ea89b34418dfe2b54b306e416dfb6a55c409a8f08891a6d1828245e91eabad07a5308b526b87c5e1bb016a SHA512 cf92f9bdfa501d4224d4764b6a061b29c0a0ebe436afd882c12acaa62dc9754306ac88b13e67992c944112af0f5efc34c6782d3a1282f039d14ba5f60fe649c3
DIST qimgv-1.0.2.tar.gz 681034 BLAKE2B 49faf11baf526e2221d1ed05a7523c452c32586900611db1823e2a50daadb14034d0b9a1363596dabde5b4b6dfd2ead8e285d1a82129bf2deda1a0c43907ffc6 SHA512 3e10a87f28f7187251c93c92b418ee34e4c2b373b0dd957604fd46305237dc52fd7e17880507b3a0d757c0c3800e8185b6085f15f6f05db6d29cae1e67044b58
-EBUILD qimgv-1.0.2-r1.ebuild 976 BLAKE2B 81e6ce585f3eb87daabebf2373463de906f868ff2f5c10fd6606486439083b9b8c2756ab9dbdf7b4c75d74847edda0791422336e235f97391899c8d63b73c4d8 SHA512 da1e30f2a35f108407a2e76476886b06b6dfbe5849ce7a89aa81f8b7c38e496cac3a5c230a43d78cb1ef5c961eaa2f80a17f94c0fb65ba62a465a01fd747b868
+EBUILD qimgv-1.0.2-r2.ebuild 1090 BLAKE2B a45e889ae60fb1272643825e005c88a2ff04bb5ef116726fd49a31eef2ed4f435d7ef77b5ede05a9500b1ef3e785f4bcf0970e95d89491b2e1fbe2987a089c9b SHA512 c8bffb20c2b96dd9e51ac0d394c4c3447c8e29c952fbac8412d54ddd3a2ecdb0ee3a4393788e6e6d64182727222377ff9d429e7cb91e002049f7d177277b0940
MISC metadata.xml 564 BLAKE2B 90edc7f7fac7d7c06557b1809ab34c1d7e6260bf3056f3dde7281bdaf5cafda94e70b700c099b03f11234ce85ec912f59df00a0fb0f4d4f861883fe567f4690c SHA512 62122cde9319219f1e6885ff50e09a2ea453da82f1ee5dcd5a6be9c3c2b0064357269751383d15aa9f206e3e1134f020efd81c787f3f097354aa27cd6b38df0e
diff --git a/media-gfx/qimgv/files/qimgv-1.0.2-exiv2-0.28.patch b/media-gfx/qimgv/files/qimgv-1.0.2-exiv2-0.28.patch
new file mode 100644
index 000000000000..86e60efe564c
--- /dev/null
+++ b/media-gfx/qimgv/files/qimgv-1.0.2-exiv2-0.28.patch
@@ -0,0 +1,49 @@
+Combined fixes from git master:
+
+From 9ffd34784b1fabe1569862b2d551d9cf06e46fa2 Mon Sep 17 00:00:00 2001
+From: adonais <hua.andy@gmail.com>
+Date: Tue, 2 Nov 2021 12:33:00 +0800
+Subject: [PATCH 1/3] reserve exiv2 exception capture
+
+(cherry picked from commit 3bd9571a0aff4611339eb57132e79b41af7acbb6)
+
+* asturmlechner 2023-06-12: Drop unrelated translation fix from commit
+---
+ qimgv/sourcecontainers/documentinfo.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+From abe43e0dc7ee6d120c3e052562748d5a2a9f7d46 Mon Sep 17 00:00:00 2001
+From: adonais <hua.andy@gmail.com>
+Date: Wed, 3 Nov 2021 09:07:30 +0800
+Subject: [PATCH 2/3] Fix exiv2 exception capture
+
+(cherry picked from commit 08d5dea2074d055f102002d1a8f705e2ad2292f1)
+---
+ qimgv/sourcecontainers/documentinfo.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+From c4d9d5b08341af6709fe6263e90f4237c67eb14c Mon Sep 17 00:00:00 2001
+From: DigitalDragon64 <digitaldragon64@gmail.com>
+Date: Thu, 8 Jun 2023 15:21:26 +0200
+Subject: [PATCH 3/3] Exiv2::AnyError was removed
+
+(cherry picked from commit bff220e6e8851482e383b71fe778a870c96cd5f8)
+---
+ qimgv/sourcecontainers/documentinfo.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/qimgv/sourcecontainers/documentinfo.cpp b/qimgv/sourcecontainers/documentinfo.cpp
+index 21979f01..9de2dd31 100644
+--- a/qimgv/sourcecontainers/documentinfo.cpp
++++ b/qimgv/sourcecontainers/documentinfo.cpp
+@@ -268,8 +268,9 @@ void DocumentInfo::loadExifTags() {
+ exifTags.insert("UserComment", comment);
+ }
+ }
++ // No exception was caught, which may cause QT crash
+ catch (Exiv2::Error& e) {
+- //std::cout << "Caught Exiv2 exception '" << e.what() << "'\n";
++ qDebug() << "Caught Exiv2 exception:\n" << e.what() << "\n";
+ return;
+ }
+ #endif
diff --git a/media-gfx/qimgv/files/qimgv-1.0.2-fix-apng-cannot-play.patch b/media-gfx/qimgv/files/qimgv-1.0.2-fix-apng-cannot-play.patch
new file mode 100644
index 000000000000..7350fb626523
--- /dev/null
+++ b/media-gfx/qimgv/files/qimgv-1.0.2-fix-apng-cannot-play.patch
@@ -0,0 +1,56 @@
+From 0db15e8ae17a03d61652766ffe411c5d010161a1 Mon Sep 17 00:00:00 2001
+From: adonais <hua.andy@gmail.com>
+Date: Mon, 1 Nov 2021 08:50:51 +0800
+Subject: [PATCH] Fix apng cannot play
+
+(cherry picked from commit e9d306ffbf93d4b9d8cfd2906eaebe0fc949930f)
+
+* asturmlechner 2023-06-12: Drop unrelated [...and update translation file]
+ part of this commit.
+---
+ qimgv/sourcecontainers/documentinfo.cpp | 17 +++++++----------
+ 1 file changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/qimgv/sourcecontainers/documentinfo.cpp b/qimgv/sourcecontainers/documentinfo.cpp
+index 98a68f75..21979f01 100644
+--- a/qimgv/sourcecontainers/documentinfo.cpp
++++ b/qimgv/sourcecontainers/documentinfo.cpp
+@@ -128,10 +128,13 @@ inline
+ // dumb apng detector
+ bool DocumentInfo::detectAPNG() {
+ QFile f(fileInfo.filePath());
+- if(f.open(QFile::ReadOnly | QFile::Text)) {
+- QTextStream in(&f);
+- QString header(in.read(120)); // 120 chars should be sufficient?
+- return header.contains("acTL");
++ if(f.open(QFile::ReadOnly)) {
++ QDataStream in(&f);
++ const int len = 120;
++ QByteArray qbuf("\0", len);
++ if (in.readRawData(qbuf.data(), len) > 0) {
++ return qbuf.contains("acTL");
++ }
+ }
+ return false;
+ }
+@@ -264,17 +267,11 @@ void DocumentInfo::loadExifTags() {
+ comment.remove(0, comment.indexOf(" ") + 1);
+ exifTags.insert("UserComment", comment);
+ }
+-
+- return;
+ }
+ catch (Exiv2::Error& e) {
+ //std::cout << "Caught Exiv2 exception '" << e.what() << "'\n";
+ return;
+ }
+- catch (Exiv2::BasicError<CharType> e) {
+- //std::cout << "Caught BasicError Exiv2 exception '" << e.what() << "'\n";
+- return;
+- }
+ #endif
+ }
+
+--
+2.41.0
+
diff --git a/media-gfx/qimgv/qimgv-1.0.2-r1.ebuild b/media-gfx/qimgv/qimgv-1.0.2-r2.ebuild
index d988cd8f2de4..99e7b39a6c18 100644
--- a/media-gfx/qimgv/qimgv-1.0.2-r1.ebuild
+++ b/media-gfx/qimgv/qimgv-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,9 +14,6 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="exif kde opencv video"
-BDEPEND="
- virtual/pkgconfig
-"
DEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -29,12 +26,13 @@ DEPEND="
opencv? ( media-libs/opencv:= )
video? ( media-video/mpv:=[libmpv] )
"
-RDEPEND="
- ${DEPEND}
-"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
-PATCHES=(
+PATCHES=( # git master backports
"${FILESDIR}"/${P}-libmpv-api2.patch
+ "${FILESDIR}"/${P}-fix-apng-cannot-play.patch
+ "${FILESDIR}"/${P}-exiv2-0.28.patch # bug 906493
)
src_configure() {