mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
media-gfx/exiv2: drop 0.27.5-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,2 +1 @@
|
||||
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
|
||||
|
||||
@@ -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://exiv2.org/builds/${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}"/${PN}-0.27.5-musl-tests.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
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
https://github.com/Exiv2/exiv2/commit/82adcb1f86def0555b25713a8b84dba84944b275 (1)
|
||||
https://github.com/Exiv2/exiv2/commit/7d8cd00778c3eee9f32af04b009d8a5651eb53e7 (2)
|
||||
|
||||
This is basically just commit (1). Though it wasn't directly applicable so I just merged it with (2).
|
||||
Easier and it makes the file same as upstream.
|
||||
|
||||
diff -u b/unitTests/test_futils.cpp b/unitTests/test_futils.cpp
|
||||
--- b/unitTests/test_futils.cpp
|
||||
+++ b/unitTests/test_futils.cpp
|
||||
@@ -42,21 +42,8 @@
|
||||
std::string tmpFile("tmp.dat");
|
||||
std::ofstream auxFile(tmpFile.c_str());
|
||||
auxFile.close();
|
||||
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__) || defined(__MSYS__)
|
||||
- const char * expectedString = "No error (errno = 0)";
|
||||
-#elif defined(__APPLE__)
|
||||
- const char * expectedString = "Undefined error: 0 (errno = 0)";
|
||||
-#elif defined(__sun__)
|
||||
- const char * expectedString = "Error 0 (errno = 0)";
|
||||
-#elif defined(__FreeBSD__)
|
||||
- const char * expectedString = "No error: 0 (errno = 0)";
|
||||
-#elif defined(__NetBSD__)
|
||||
- const char * expectedString = "Undefined error: 0 (errno = 0)";
|
||||
-#else
|
||||
- const char * expectedString = "Success (errno = 0)";
|
||||
-#endif
|
||||
std::remove(tmpFile.c_str());
|
||||
- ASSERT_STREQ(expectedString, strError().c_str());
|
||||
+ ASSERT_TRUE(strError().find("(errno = 0)") != std::string::npos);
|
||||
}
|
||||
|
||||
TEST(strError, returnNoSuchFileOrDirectoryWhenTryingToOpenNonExistingFile)
|
||||
@@ -68,22 +55,7 @@
|
||||
TEST(strError, doNotRecognizeUnknownError)
|
||||
{
|
||||
errno = 9999;
|
||||
-#if defined(__MINGW__) || defined(__MSYS__) || defined(__CYGWIN__)
|
||||
- const char * expectedString = "Unknown error 9999 (errno = 9999)";
|
||||
-#elif defined(_WIN32)
|
||||
- const char * expectedString = "Unknown error (errno = 9999)";
|
||||
-#elif defined(__APPLE__)
|
||||
- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
|
||||
-#elif defined(__sun__)
|
||||
- const char * expectedString = "Unknown error (errno = 9999)";
|
||||
-#elif defined(__FreeBSD__)
|
||||
- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
|
||||
-#elif defined(__NetBSD__)
|
||||
- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
|
||||
-#else
|
||||
- const char * expectedString = "Unknown error 9999 (errno = 9999)";
|
||||
-#endif
|
||||
- ASSERT_STREQ(expectedString, strError().c_str());
|
||||
+ ASSERT_TRUE(strError().find("(errno = 9999)") != std::string::npos);
|
||||
}
|
||||
|
||||
TEST(getEnv, getsDefaultValueWhenExpectedEnvVariableDoesNotExist)
|
||||
Reference in New Issue
Block a user