Drop libfmt

We can use std::format() and a custom print() wrapper with C++20. When
moving to C++23, we can drop the wrapper.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>

3 files changed, 30 insertions, 2 deletions

diff --git a/kms++/inc/kms++/format.h b/kms++/inc/kms++/format.h
new file mode 100644
index 0000000..b48babe
--- /dev/null
+++ b/kms++/inc/kms++/format.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <cstdio>
+#include <format>
+#include <string>
+
+// This can be removed when moving to C++23. For now, this gives us
+// fmt::format() and fmt::print().
+
+namespace fmt {
+
+using std::format;
+
+template<typename... Args>
+void print(std::format_string<Args...> fmtstr, Args&&... args)
+{
+	std::string s = std::format(fmtstr, std::forward<Args>(args)...);
+	std::fwrite(s.data(), 1, s.size(), stdout);
+}
+
+template<typename... Args>
+void print(std::FILE* f, std::format_string<Args...> fmtstr, Args&&... args)
+{
+	std::string s = std::format(fmtstr, std::forward<Args>(args)...);
+	std::fwrite(s.data(), 1, s.size(), f);
+}
+
+} // namespace fmt
diff --git a/kms++/meson.build b/kms++/meson.build
index cd7a494..4fb5fc9 100644
--- a/kms++/meson.build
+++ b/kms++/meson.build
@@ -68,7 +68,7 @@ else
     omapdrm_enabled = false
 endif
 
-libkmsxx_deps = [ libdrm_dep, libfmt_dep, libdrmomap_dep ]
+libkmsxx_deps = [ libdrm_dep, libdrmomap_dep ]
 
 libkmsxx = library('kms++',
                    libkmsxx_sources,
diff --git a/kms++/src/videomode.cpp b/kms++/src/videomode.cpp
index 4be6de7..b7b1b28 100644
--- a/kms++/src/videomode.cpp
+++ b/kms++/src/videomode.cpp
@@ -2,7 +2,7 @@
 #include <xf86drmMode.h>
 #include <cmath>
 #include <sstream>
-#include <fmt/format.h>
+#include <kms++/format.h>
 
 #include <kms++/kms++.h>
 #include "helpers.h"