From: Adam Mizerski <adam@mizerski.pl>
Date: 2021-02-04T01:03:27+01:00
Subject: use system fmt
Upstream: no

By default it's built from bundled source as shared library and not installed.

Index: pioneer-20230203/CMakeLists.txt
===================================================================
--- pioneer-20230203.orig/CMakeLists.txt
+++ pioneer-20230203/CMakeLists.txt
@@ -229,7 +229,7 @@ find_package(Freetype REQUIRED)
 find_package(OpenGL REQUIRED)
 
 add_subdirectory(contrib/lz4)
-add_subdirectory(contrib/fmt)
+find_package(fmt REQUIRED)
 
 set(NANOSOCKETS_STATIC "1")
 add_subdirectory(contrib/nanosockets)
@@ -241,7 +241,6 @@ include_directories(
 	${PIONEER_SRC}
 	${PIONEER_CONTRIB}
 	${PIONEER_CONTRIB}/doctest
-	${PIONEER_CONTRIB}/fmt/include
 	${ASSIMP_INCLUDE_DIRS}
 	${FREETYPE_INCLUDE_DIRS}
 	${OPENGL_INCLUDE_DIRS}
@@ -328,7 +327,7 @@ if (PYTHON)
 		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 endif()
 
-target_link_libraries(pioneer-lib PUBLIC lz4 fmt::fmt)
+target_link_libraries(pioneer-lib PUBLIC lz4 fmt)
 
 list(APPEND pioneerLibs
 	pioneer-core
Index: pioneer-20230203/src/lua/LuaPiGui.cpp
===================================================================
--- pioneer-20230203.orig/src/lua/LuaPiGui.cpp
+++ pioneer-20230203/src/lua/LuaPiGui.cpp
@@ -2038,7 +2038,7 @@ bool PiGui::first_body_is_more_important
 	else if (b == ObjectType::PROJECTILE)
 		result = false;
 	else
-		Error("don't know how to compare %i and %i\n", a, b);
+		Error("don't know how to compare %i and %i\n", int(a), int(b));
 
 	return result;
 }
Index: pioneer-20230203/src/versioningInfo.cpp
===================================================================
--- pioneer-20230203.orig/src/versioningInfo.cpp
+++ pioneer-20230203/src/versioningInfo.cpp
@@ -37,7 +37,7 @@ void OutputVersioningInfo()
 	Output("LibCurl Version: %s", LIBCURL_VERSION);
 #endif
 
-	Output("GLEW dynamic version: %s\n", glewGetString(GLEW_VERSION));
+	Output("GLEW dynamic version: %s\n", fmt::string_view{reinterpret_cast<const char*>(glewGetString(GLEW_VERSION))});
 	Output("--------------------\n");
 	Output("\n");
 }
Index: pioneer-20230203/src/graphics/opengl/RendererGL.cpp
===================================================================
--- pioneer-20230203.orig/src/graphics/opengl/RendererGL.cpp
+++ pioneer-20230203/src/graphics/opengl/RendererGL.cpp
@@ -164,7 +164,7 @@ namespace Graphics {
 		glewExperimental = true;
 		GLenum glew_err;
 		if ((glew_err = glewInit()) != GLEW_OK)
-			Error("GLEW initialisation failed: %s", glewGetErrorString(glew_err));
+			Error("GLEW initialisation failed: %s", fmt::string_view{reinterpret_cast<const char*>(glewGetErrorString(glew_err))});
 
 		// pump this once as glewExperimental is necessary but spews a single error
 		glGetError();
Index: pioneer-20230203/src/graphics/opengl/Program.cpp
===================================================================
--- pioneer-20230203.orig/src/graphics/opengl/Program.cpp
+++ pioneer-20230203/src/graphics/opengl/Program.cpp
@@ -45,7 +45,7 @@ namespace Graphics {
 
 			if (status == GL_FALSE) {
 				Log::Error("Error compiling shader: {}:\n {}\n OpenGL vendor: {}\nOpenGL renderer string: {}",
-					filename, infoLog, glGetString(GL_VENDOR), glGetString(GL_RENDERER));
+					filename, infoLog, fmt::string_view{reinterpret_cast<const char *>(glGetString(GL_VENDOR))}, fmt::string_view{reinterpret_cast<const char *>(glGetString(GL_RENDERER))});
 				return false;
 			}
 
Index: pioneer-20230203/src/CityOnPlanet.cpp
===================================================================
--- pioneer-20230203.orig/src/CityOnPlanet.cpp
+++ pioneer-20230203/src/CityOnPlanet.cpp
@@ -150,7 +150,7 @@ void CityOnPlanet::LoadBuildingType(std:
 	}
 
 	Log::Verbose("\tLoaded city building {} ({}x{}c, atm: {}, arl: {}, kind: {}, idleAnim: {})",
-		key, out.cellSize[0], out.cellSize[1], out.rarityAtmo, out.rarityAirless, out.buildingKind, out.idleAnimation != nullptr);
+		key, out.cellSize[0], out.cellSize[1], out.rarityAtmo, out.rarityAirless, static_cast<uint32_t>(out.buildingKind), out.idleAnimation != nullptr);
 }
 
 void CityOnPlanet::LoadCityFlavour(const FileSystem::FileInfo &file)