commit: 8cd6e09b9b12d1ff05005cae40f6778a7482919d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 18:47:23 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 19:07:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cd6e09b
media-gfx/exiv2: add 0.27.6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/exiv2/Manifest | 1 +
media-gfx/exiv2/exiv2-0.27.6.ebuild | 115 ++++++++++++++++++++++
media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch | 69 +++++++++++++
3 files changed, 185 insertions(+)
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index a9c896be4e08..5a905dcc84d7 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1 +1,2 @@
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
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.ko...@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.ko...@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?=
+ <miloskomarce...@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
