summaryrefslogtreecommitdiff
path: root/dev-libs/spdlog
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/spdlog')
-rw-r--r--dev-libs/spdlog/Manifest7
-rw-r--r--dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch33
-rw-r--r--dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch13
-rw-r--r--dev-libs/spdlog/spdlog-1.6.1-r1.ebuild52
-rw-r--r--dev-libs/spdlog/spdlog-1.7.0.ebuild47
-rw-r--r--dev-libs/spdlog/spdlog-9999.ebuild2
6 files changed, 152 insertions, 2 deletions
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index eade5cbba736..4953f7791eb0 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,6 +1,11 @@
+AUX spdlog-1.6.1-libfmt-7.0.0.patch 1218 BLAKE2B 2d3dce85374db1489c5a94eab92b24e947334b7e56345eac17d0e71a0fcce9c99d886f36695023d3af872bf76d5e325b50f5b82cbe979ef539e4db52eb8db1ee SHA512 bc3beb83654ca6c69d6732ccc62c33df202e14e53e0ac5a762d163efb933ba6ebb0d169c53067ba724216886f4036ebfdea1a86a21c3ff3f06a26049e85fac32
+AUX spdlog-1.6.1-tests-fix.patch 486 BLAKE2B 07ba02aa06ce18ffa0cba7f6c7b1a981733161e118c2a19dae0a6efaaa59f449036d43e87fefbf3ae1e51ba13f164987b82f87fa2409d68035d88f4e0b98bfb5 SHA512 798529555072bca9f720678cd4b7a9da8c83802aadc5e88c183a4a1278759ae23b4759ae94f3008b90cf11bbc6df371fac03f4f12967e013165a06ad13647fe8
DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
DIST spdlog-1.6.1.tar.gz 285531 BLAKE2B 525f29098fd0f771e14cc7c4bd8bf5d4054a0f68255aea29ef5158ce61516d9e5f0ae0fb72a2f54303d18194a54acb5c1731f53ee6edcd74ff487227bc332236 SHA512 1e15e7710744212240d79897af8c3bde14fe3b745a1377643d18dc0038f18fc7582236ff21836d3eae2c75cf1f4820ca4c642c5c3f63f9ae138289aa4d00e22e
+DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a91d17b014abec26fd0f2ce3d25dd33cfb925f4468fa32da394f6efaca033290bdcf66abe8b067444999b87b63 SHA512 e15d461ac7a6d3d3186fe4283e4fbaf56b2ce3011babf892e3b2d3dbdd7e999a861f1f6f67a9d88a5cf488a440add087ea78e96131f49b52ed6c7815a972799a
EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261
+EBUILD spdlog-1.6.1-r1.ebuild 1031 BLAKE2B 8f524b4048ea904c75af6305fddbdadfc7db39bad605b43f4991df718955d1ca3a753e6c116c4c9e7566c08e3da5c2be1260901a504e6af963b70cbc5a65bbc7 SHA512 c51dea37423c49256ca17d12d3882b6babe2a3653a82122e03f9bdaeb7c3fe2e11535769a410c7fb6fd89472187d40cd111e18a15e79df2ebaffd379b1ee21ae
EBUILD spdlog-1.6.1.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
-EBUILD spdlog-9999.ebuild 914 BLAKE2B a5362a8845f61d921f2d136dd6a55beb3931539e07b4fd8950730c32975e160f5162e27862bae3d6ffddd3ae77c210128dd33cdfa22a509125f628e0869775ea SHA512 15f272868287039f55fbc82018bd5dd49074534d0efc50aeb022abb1442c9a9fdb90496528d2f2d8905cef3df311b1fc428451f605aac572a78e908ccb0f797a
+EBUILD spdlog-1.7.0.ebuild 939 BLAKE2B 0c35c5831ee9567ea95f76e2f552fb695a8e30f141f10fb64d06f82be199257c65b24236226d90f8e0fba0447538eda2ca77b7ea09d441c697cf692854f2f3c0 SHA512 3f22ac7f314e3e3efa94ef74a91620d87da244b2cbc0edc1da8e979da912e41fcef358b4a74d8c2358332503aa80422b7357405692297669184d2bf273308c96
+EBUILD spdlog-9999.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch
new file mode 100644
index 000000000000..422a507a6d86
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch
@@ -0,0 +1,33 @@
+https://github.com/gabime/spdlog/pull/1606
+
+From 22bee8128a4150ce37cf761ed9a609ad891848a6 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Mon, 6 Jul 2020 13:01:52 -0400
+Subject: [PATCH] fmt 7.0.0 renamed the internal namespace to detail.
+
+See: https://github.com/fmtlib/fmt/issues/1538
+---
+ include/spdlog/details/fmt_helper.h | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h
+index cbc0bdf3..4f363858 100644
+--- a/include/spdlog/details/fmt_helper.h
++++ b/include/spdlog/details/fmt_helper.h
+@@ -34,7 +34,15 @@ template<typename T>
+ inline unsigned int count_digits(T n)
+ {
+ using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type;
+- return static_cast<unsigned int>(fmt::internal::count_digits(static_cast<count_type>(n)));
++ return static_cast<unsigned int>(fmt::
++// fmt 7.0.0 renamed the internal namespace to detail.
++// See: https://github.com/fmtlib/fmt/issues/1538
++#if FMT_VERSION < 70000
++internal
++#else
++detail
++#endif
++::count_digits(static_cast<count_type>(n)));
+ }
+
+ inline void pad2(int n, memory_buf_t &dest)
diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
new file mode 100644
index 000000000000..8a6aa8020f7d
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h
+index e974cf51..5393dcac 100644
+--- a/include/spdlog/fmt/bin_to_hex.h
++++ b/include/spdlog/fmt/bin_to_hex.h
+@@ -92,7 +92,7 @@ struct formatter<spdlog::details::dump_info<T>>
+ auto parse(ParseContext &ctx) -> decltype(ctx.begin())
+ {
+ auto it = ctx.begin();
+- while (*it && *it != '}')
++ while (it != ctx.end() && *it != '}')
+ {
+ switch (*it)
+ {
diff --git a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..6d996c6f8eae
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gabime/${PN}"
+else
+ SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ >=dev-libs/libfmt-5.3.0:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-libfmt-7.0.0.patch"
+ "${FILESDIR}/${P}-tests-fix.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+ rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSPDLOG_BUILD_BENCH=no
+ -DSPDLOG_BUILD_EXAMPLE=no
+ -DSPDLOG_FMT_EXTERNAL=yes
+ -DSPDLOG_BUILD_SHARED=yes
+ -DSPDLOG_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-libs/spdlog/spdlog-1.7.0.ebuild b/dev-libs/spdlog/spdlog-1.7.0.ebuild
new file mode 100644
index 000000000000..302ff616a0aa
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gabime/${PN}"
+else
+ SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ >=dev-libs/libfmt-6.1.2:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ cmake_src_prepare
+ rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSPDLOG_BUILD_BENCH=no
+ -DSPDLOG_BUILD_EXAMPLE=no
+ -DSPDLOG_FMT_EXTERNAL=yes
+ -DSPDLOG_BUILD_SHARED=yes
+ -DSPDLOG_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 24491a214dcb..6da33cbbf3c6 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/gabime/${PN}"
else
SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
fi
LICENSE="MIT"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 12:49:56 +0000