From c2256d8d2e24db77f8968223723c6741d0bdb04e Mon Sep 17 00:00:00 2001 From: apoorv569 Date: Fri, 16 Sep 2022 16:33:47 +0530 Subject: [PATCH] Revert spdlog version v1.9.2 as v1.10.0 seems to have issues with fmt. --- meson.build | 2 +- src/Utility/Log.hpp | 2 +- subprojects/spdlog.wrap | 15 +++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index dd37989..ed5aaf5 100755 --- a/meson.build +++ b/meson.build @@ -266,7 +266,7 @@ endif snd_subproject = cmake.subproject('libsndfile', options: snd_opts) snd = snd_subproject.dependency('sndfile') -spdlog = dependency('spdlog', version: '>=1.10.0', required: false) +spdlog = dependency('spdlog', version: '>=1.9.2', required: false) if not spdlog.found() spdlog_subproject = subproject('spdlog', diff --git a/src/Utility/Log.hpp b/src/Utility/Log.hpp index ece2918..1eea54b 100644 --- a/src/Utility/Log.hpp +++ b/src/Utility/Log.hpp @@ -24,7 +24,7 @@ #include -#ifndef SH_BUILD_DEBUG +#ifdef SH_BUILD_DEBUG #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_TRACE #else #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_OFF diff --git a/subprojects/spdlog.wrap b/subprojects/spdlog.wrap index 64db0d0..4ca5fb9 100644 --- a/subprojects/spdlog.wrap +++ b/subprojects/spdlog.wrap @@ -1,12 +1,11 @@ [wrap-file] -directory = spdlog-1.10.0 -source_url = https://github.com/gabime/spdlog/archive/v1.10.0.tar.gz -source_filename = v1.10.0.tar.gz -source_hash = 697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224 -patch_filename = spdlog_1.10.0-3_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.10.0-3/get_patch -patch_hash = 5bb07b4af1e971817d4b886efbe077aaf6c36d72d3d7e461bbcf6631f3725704 -wrapdb_version = 1.10.0-3 +directory = spdlog-1.9.2 +source_url = https://github.com/gabime/spdlog/archive/v1.9.2.tar.gz +source_filename = v1.9.2.tar.gz +source_hash = 6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38 +patch_filename = spdlog_1.9.2-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.9.2-1/get_patch +patch_hash = 77182bd65366818ef61fd5bd1745fedd4a6d4aeefc03f34a1ddb05ef9c944c95 [provide] spdlog = spdlog_dep \ No newline at end of file