gentoo auto-resync : 26:01:2023 - 01:54:54

6 files changed, 189 insertions, 2 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d4201c583695..5d06e32aea06 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 9fdad3979882..e0d127eae17d 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,4 +1,7 @@
 AUX exiv2-0.27.5-musl-tests.patch 2390 BLAKE2B b6e69abee39168f0ecf1cfe6220d017802abae12a22ffaefe96c9a4c3a47748810bbc27bfc65d7b2a1c0b8499b5756123e7d475ef872c87337851d93241012fb SHA512 ba1bffe8a477ec90a8cc83eebaecc9608f5a953bba433cff0d62e807457969f37bdc97c205ffcf8d0fe4c948f2b67172f33adca5edacd68e35ba10366bbc4c85
+AUX exiv2-0.27.6-jxl-mime.patch 2704 BLAKE2B b7d88658863aef95717b917c006b609279b09f808fb415c9c42b648b61403c0b9fa2c4552470d943ea2b03212fa06fb6c6607cf7331ae0a47ad11a1a1b811e08 SHA512 6461be2af1a4e4318da2b2fdd623e0396de4f43a62b20fb58e7ceac1aa3394bf848ab0107c99267324a7a613cc1a46b68e44696dd3af9eb4bb2c9b0d7b3fe988
 DIST exiv2-0.27.5-Source.tar.gz 32720608 BLAKE2B 803cb853fd049b28d309952c2332589a8544ff90c16fc1a588b6f1a2d4ae5e96da7ae746cf2247954ac54e155b84e0ad1f4f2d89f22d07e7bbd34038f0e292a5 SHA512 0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491
+DIST exiv2-0.27.6-Source.tar.gz 32280263 BLAKE2B a025452b7e70aef109a2f7831ba5c0528b0cb8fda92e5959a5927abd442d650f8d40cc47f56d8f87508e5f37e8378728f99e3a4fa96e7a0319cb4542659d9a60 SHA512 045d7fb391202b53897336094812600680141a292367a9194e9529bccb8ab54465190ea0f0636970114402a38840b33b2fcf2edf7b6c616f3e585fa295a887a4
 EBUILD exiv2-0.27.5-r1.ebuild 2843 BLAKE2B 9701fe996760810786ba4ac9820b88ab020b2ec337c6f5df691582b4f2271077d724c53a5d972e7cc33171e8c8f68784c203121cb6a036bc01e40ad17aa5ba4c SHA512 89f92aa2f5cd486fb317932c569040dbde0747b1a10d8e76aee712ba3e9d5e0018116968f12c0216ad7cdb3fc31bcd36b834946cb66cf11156366f1ae422df4f
+EBUILD exiv2-0.27.6.ebuild 2872 BLAKE2B 586593ac740ba03d8d83109383def7a1c3abeca910f9ed0fcf5fc68f2bc7dd6fd6bb20bad9a631fb81c2d4d6b83b595761f3c69315ad56d2d28d5461f000d165 SHA512 f53aad142c2d4c3aa89378566d02f0826ad261ecc4ea69280a1c09674f438b4a159396e3e9f571d1d55231d84f33f0387da6cdfbc5b407815c460a7995bc1818
 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
new file mode 100644
index 000000000000..93b4c20729ea
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.27.6.ebuild
@@ -0,0 +1,115 @@
+# 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 ~x86-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
new file mode 100644
index 000000000000..b23e38736dca
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch
@@ -0,0 +1,69 @@
+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/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 1a420af2ddca..f4b5f8c5194a 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -2,5 +2,5 @@ AUX photoqt-2.9.1-libmpv-api2.patch 927 BLAKE2B 5bc7066b172ebf8c5b044e83e66c0c4e
 AUX photoqt-2.9.1-libraw-0.21.patch 935 BLAKE2B 3437071bc0a62122d71b536ce2f211b53e1242f1aeb3837f22e92d48ee7ea75d6e26ab240e46d1f38d76fd3d456ddf22512508d6fea9f3e6e4d0f8a2909de06a SHA512 c45089079fabcd084476ee0d3440402eefddfddbcd1ae71ac6fd498a17531059ff51251bc757a4f988ccb1b138042fdcf3b49f74b85b1ea12646c8c126183714
 DIST photoqt-2.9.1.tar.gz 3708647 BLAKE2B dd8c958709ebd830558f150f59c90c317d3f5edb363f92e9fadcd1506de4c97a41f6766670e202081397081c231604028298771eb52911255dae53bfa92a1a8d SHA512 c2ac3bce2ffa0962b243808cdd2495d45af3bd5703389de5e9626a518a8edf25646a317ff420dc0fdd8dc60a53104b1b5ec7e473087454d5c2f0b967066dc192
 EBUILD photoqt-2.9.1-r1.ebuild 1797 BLAKE2B 94eca12eb9f6939d739a4675b512233fe6c29b1b106209c008ce3b776c50d4eafebbb69db9f713042396bc3543cb870d855aabf124df5bb431f59d6aae38fb6e SHA512 8ea31f2d4affb00d9a56ffa7e89d0aa8fb6527f0f7658366f8a6ac0097764318b86959d27cc14c850a3d92455faf15d0d9f0b520b7587d891cd09cd268b88b5d
-EBUILD photoqt-2.9.1-r2.ebuild 1836 BLAKE2B c645dc41deb4d113a962eb18a09fdcba12b074fe448a71bea1913cffa8efacdc0cd3d98993c5846505c23a4fc65f04d89f183de67c6d201068593c4d0648ad6f SHA512 3b6018e000fd8267d7a8012cb32c6f488188af8d203bfb2751eadfdceadd2f5cc51cc39712a78c5b4b446a8b4b773161af9274adad2688a898db00434370fc42
+EBUILD photoqt-2.9.1-r2.ebuild 1835 BLAKE2B b0647232f94c3717f899a1e4c12ab7a05bc8ad39f3fbe3daf9f81aad0454c5d8239e9dcc9666a6f0c57a80271129c1956e97283c863a431e6d1d169eb3aac4eb SHA512 10ab70618ab15a0a412fa18d08d50cd06c6417a39a530d9f4ad9ff58636b72042ac5b5c77f301d45132b87f189a1cbcd88f2ac4026c134285bbbdf91317a37df
 MISC metadata.xml 544 BLAKE2B 050620e07354fb5d5808b90f3a412a81adf17dfa99b5a0afb9f75cc76051da1b0c693a34cf7e325f465871107f8dbbbe59c6f5adb77de6f9625cbeb6acd8fd75 SHA512 56acfa4ec0047826ee31e1b7216c5860790850f3f84f0ccd454baa0d2cb82db06a08f8a5c9458cc562d0b14082815ee1623e5171f579dcecaa45a759ac47cb84
diff --git a/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild b/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild
index 5f63ed3a14b4..3d56e5fca782 100644
--- a/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild
+++ b/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="devil exif freeimage graphicsmagick imagemagick mpv pdf raw"
 
 COMMON_DEPEND="