pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/easyrpg-player
Module Name: pkgsrc
Committed By: wiz
Date: Sun May 21 06:27:31 UTC 2023
Modified Files:
pkgsrc/games/easyrpg-player: distinfo
Added Files:
pkgsrc/games/easyrpg-player/patches: patch-src_audio__generic.cpp
patch-src_autobattle.cpp patch-src_bitmap.cpp patch-src_cache.cpp
patch-src_dynrpg.cpp patch-src_dynrpg.h patch-src_enemyai.cpp
patch-src_filefinder.cpp patch-src_filefinder__rtp.cpp
patch-src_filesystem__root.cpp patch-src_game__character.cpp
patch-src_game__interpreter.cpp
patch-src_game__interpreter__map.cpp patch-src_game__system.cpp
patch-src_meta.cpp patch-src_output.cpp
patch-src_scene__battle__rpg2k.cpp
patch-src_scene__battle__rpg2k3.cpp patch-src_scene__debug.cpp
Log Message:
easyrpg-player: adapt some code for fmtlib 10
XXX: more to do
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/easyrpg-player/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/games/easyrpg-player/patches/patch-src_audio__generic.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_autobattle.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_bitmap.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_cache.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_dynrpg.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_dynrpg.h \
pkgsrc/games/easyrpg-player/patches/patch-src_enemyai.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_filefinder.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_filefinder__rtp.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_filesystem__root.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_game__character.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_game__interpreter.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_game__interpreter__map.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_game__system.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_meta.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_output.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_scene__battle__rpg2k.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_scene__battle__rpg2k3.cpp \
pkgsrc/games/easyrpg-player/patches/patch-src_scene__debug.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/games/easyrpg-player/distinfo
diff -u pkgsrc/games/easyrpg-player/distinfo:1.10 pkgsrc/games/easyrpg-player/distinfo:1.11
--- pkgsrc/games/easyrpg-player/distinfo:1.10 Sun Jan 16 14:32:01 2022
+++ pkgsrc/games/easyrpg-player/distinfo Sun May 21 06:27:31 2023
@@ -1,5 +1,24 @@
-$NetBSD: distinfo,v 1.10 2022/01/16 14:32:01 nia Exp $
+$NetBSD: distinfo,v 1.11 2023/05/21 06:27:31 wiz Exp $
BLAKE2s (easyrpg-player-0.7.0.tar.xz) = c1e9805c977cde92314d10ed419c2ff26d63f48e946fe8152bc855e15cb6fa9e
SHA512 (easyrpg-player-0.7.0.tar.xz) = 112543adf2e95d68842f21fabeddf9dc5abbf2b2a1b64a5d9da29bf4e2d31c7b85cfb596c453ff1773922260a8e6d7c1cad40ff7bf1d1054a876ec2f5ef24444
Size (easyrpg-player-0.7.0.tar.xz) = 4845184 bytes
+SHA1 (patch-src_audio__generic.cpp) = 76191a584cfcd1586628841abe4017bade444fac
+SHA1 (patch-src_autobattle.cpp) = 1b87ac19f44cd6080cc5cea50fd739542acfbd8e
+SHA1 (patch-src_bitmap.cpp) = e9c05fa5743d0c40bf36de02a97d98dec41b5d7d
+SHA1 (patch-src_cache.cpp) = 3231d27a97e0374f95cf246a062e345f527f4299
+SHA1 (patch-src_dynrpg.cpp) = 99b238882e6564f61de62c7f6724f8638bf05012
+SHA1 (patch-src_dynrpg.h) = 3bc50392f13696df0e2e904f2f72c50984c258e0
+SHA1 (patch-src_enemyai.cpp) = 0d67b81d4a61a2567b4906e3a8ff2a75044b4061
+SHA1 (patch-src_filefinder.cpp) = 6c53511ddd1568f152d6259cf21b3e2aa7a99dd7
+SHA1 (patch-src_filefinder__rtp.cpp) = c67401a043bb2d3d84a4803afd9a8451ce693dd6
+SHA1 (patch-src_filesystem__root.cpp) = c5e35dc6660b1f46c55588d8564ab062efc24f30
+SHA1 (patch-src_game__character.cpp) = f0a8703d93ad158f19c59e7a01cefc9b2a9512c7
+SHA1 (patch-src_game__interpreter.cpp) = 142556d79cffcaa2875621c667cac8b68b9da9eb
+SHA1 (patch-src_game__interpreter__map.cpp) = 5bc2b652496ae9267601008df62841fc2a8dddb5
+SHA1 (patch-src_game__system.cpp) = acf994e16e723a29e56b20a4cb0e29e5736c83f8
+SHA1 (patch-src_meta.cpp) = 8d11b9811cd466b18c14f3ec84e21bff599efb2b
+SHA1 (patch-src_output.cpp) = 0a86385d32d008b37ca6bbf9be0c618b5e421c19
+SHA1 (patch-src_scene__battle__rpg2k.cpp) = 3df7de5bad294dc712575720368dc9c55dec67d3
+SHA1 (patch-src_scene__battle__rpg2k3.cpp) = 914273345c28c669a88414678fbc1c2c57fbab44
+SHA1 (patch-src_scene__debug.cpp) = db904615b52ced0971af0f18eb4c5abf7796b946
Added files:
Index: pkgsrc/games/easyrpg-player/patches/patch-src_audio__generic.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_audio__generic.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_audio__generic.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_audio__generic.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/audio_generic.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/audio_generic.cpp
+@@ -167,7 +167,7 @@ void GenericAudio::SE_Play(Filesystem_St
+ }
+ }
+ // FIXME Not displaying as warning because multiple games exhaust free channels available, see #1356
+- Output::Debug("Couldn't play {} SE. No free channel available", stream.GetName());
++ Output::Debug("Couldn't play {} SE. No free channel available", std::string(stream.GetName()));
+ }
+
+ void GenericAudio::SE_Stop() {
+@@ -191,7 +191,7 @@ bool GenericAudio::PlayOnChannel(BgmChan
+ chan.stopped = false; // Unstop channel so the audio thread doesn't delete it
+
+ if (!filestream) {
+- Output::Warning("BGM file not readable: {}", filestream.GetName());
++ Output::Warning("BGM file not readable: {}", std::string(filestream.GetName()));
+ return false;
+ }
+
+@@ -247,7 +247,7 @@ bool GenericAudio::PlayOnChannel(BgmChan
+
+ return true;
+ } else {
+- Output::Warning("Couldn't play BGM {}. Format not supported", filestream.GetName());
++ Output::Warning("Couldn't play BGM {}. Format not supported", std::string(filestream.GetName()));
+ }
+
+ return false;
+@@ -266,7 +266,7 @@ bool GenericAudio::PlayOnChannel(SeChann
+ chan.paused = false; // Unpause channel -> Play it.
+ return true;
+ } else {
+- Output::Warning("Couldn't play SE {}. Format not supported", filestream.GetName());
++ Output::Warning("Couldn't play SE {}. Format not supported", std::string(filestream.GetName()));
+ }
+
+ return false;
Index: pkgsrc/games/easyrpg-player/patches/patch-src_autobattle.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_autobattle.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_autobattle.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_autobattle.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/autobattle.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/autobattle.cpp
+@@ -54,7 +54,7 @@ std::unique_ptr<AlgorithmBase> CreateAlg
+ if (Utils::StrICmp(name, RpgRtCompat::name) != 0) {
+ static bool warned = false;
+ if (!warned) {
+- Output::Debug("Invalid AutoBattle algo name `{}' falling back to {} ...", name, RpgRtCompat::name);
++ Output::Debug("Invalid AutoBattle algo name `{}' falling back to {} ...", std::string(name), RpgRtCompat::name);
+ warned = true;
+ }
+ }
Index: pkgsrc/games/easyrpg-player/patches/patch-src_bitmap.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_bitmap.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_bitmap.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_bitmap.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/bitmap.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/bitmap.cpp
+@@ -96,7 +96,7 @@ Bitmap::Bitmap(Filesystem_Stream::InputS
+ pixman_format = find_format(format);
+
+ if (!stream) {
+- Output::Error("Couldn't read image file {}", stream.GetName());
++ Output::Error("Couldn't read image file {}", std::string(stream.GetName()));
+ return;
+ }
+
+@@ -117,7 +117,7 @@ Bitmap::Bitmap(Filesystem_Stream::InputS
+ else if (bytes >= 4 && strncmp((char*)(data + 1), "PNG", 3) == 0)
+ img_okay = ImagePNG::ReadPNG(stream, transparent, w, h, pixels);
+ else
+- Output::Warning("Unsupported image file {} (Magic: {:02X})", stream.GetName(), *reinterpret_cast<uint32_t*>(data));
++ Output::Warning("Unsupported image file {} (Magic: {:02X})", std::string(stream.GetName()), *reinterpret_cast<uint32_t*>(data));
+
+ if (!img_okay) {
+ free(pixels);
Index: pkgsrc/games/easyrpg-player/patches/patch-src_cache.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_cache.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_cache.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,45 @@
+$NetBSD: patch-src_cache.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/cache.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/cache.cpp
+@@ -263,9 +263,9 @@ namespace {
+
+ if (!is) {
+ if (s.warn_missing) {
+- Output::Warning("Image not found: {}/{}", s.directory, filename);
++ Output::Warning("Image not found: {}/{}", std::string(s.directory), std::string(filename));
+ } else {
+- Output::Debug("Image not found: {}/{}", s.directory, filename);
++ Output::Debug("Image not found: {}/{}", std::string(s.directory), std::string(filename));
+ bmp = CreateEmpty<T>();
+ }
+ } else {
+@@ -274,7 +274,7 @@ namespace {
+ T == Material::System ? Bitmap::Flag_System : 0);
+ bmp = Bitmap::Create(std::move(is), transparent, flags);
+ if (!bmp) {
+- Output::Warning("Invalid image: {}/{}", s.directory, filename);
++ Output::Warning("Invalid image: {}/{}", std::string(s.directory), std::string(filename));
+ }
+ }
+ }
+@@ -307,7 +307,7 @@ namespace {
+
+ if (w < min_w || max_w < w || h < min_h || max_h < h) {
+ Output::Debug("Image size out of bounds: {}/{} ({}x{} < {}x{} < {}x{})",
+- s.directory, filename, min_w, min_h, w, h, max_w, max_h);
++ std::string(s.directory), std::string(filename), min_w, min_h, w, h, max_w, max_h);
+ }
+ }
+
+@@ -357,7 +357,7 @@ BitmapRef Cache::Faceset(StringView file
+ }
+
+ BitmapRef Cache::Frame(StringView file, bool transparent) {
+- return LoadBitmap<Material::Frame>(file, transparent);
++ return LoadBitmap<Material::Frame>(std::string(file), transparent);
+ }
+
+ BitmapRef Cache::Gameover(StringView file) {
Index: pkgsrc/games/easyrpg-player/patches/patch-src_dynrpg.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_dynrpg.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_dynrpg.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_dynrpg.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/dynrpg.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/dynrpg.cpp
+@@ -63,7 +63,7 @@ std::string DynRpg::ParseVarArg(StringVi
+ parse_okay = true;
+ if (index >= static_cast<int>(args.size())) {
+ parse_okay = false;
+- Output::Warning("{}: Vararg {} out of range", func_name, index);
++ Output::Warning("{}: Vararg {} out of range", std::string(func_name), index);
+ return "";
+ }
+
+@@ -95,7 +95,7 @@ std::string DynRpg::ParseVarArg(StringVi
+ else {
+ // $-ref out of range
+ parse_okay = false;
+- Output::Warning("{}: Vararg $-ref {} out of range", func_name, i);
++ Output::Warning("{}: Vararg $-ref {} out of range", std::string(func_name), i);
+ return "";
+ }
+
Index: pkgsrc/games/easyrpg-player/patches/patch-src_dynrpg.h
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_dynrpg.h:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_dynrpg.h Sun May 21 06:27:31 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_dynrpg.h,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/dynrpg.h.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/dynrpg.h
+@@ -62,7 +62,7 @@ namespace DynRpg {
+ iss >> value;
+ parse_okay = !iss.fail();
+ if (!parse_okay) {
+- Output::Warning("{}: Arg {} ({}) is not numeric", func_name, i, args[i]);
++ Output::Warning("{}: Arg {} ({}) is not numeric", std::string(func_name), i, std::string(args[i]));
+ parse_okay = false;
+ }
+ return parse_okay;
+@@ -80,7 +80,7 @@ namespace DynRpg {
+ iss >> value;
+ parse_okay = !iss.fail();
+ if (!parse_okay) {
+- Output::Warning("{}: Arg {} ({}) is not an integer", func_name, i, args[i]);
++ Output::Warning("{}: Arg {} ({}) is not an integer", std::string(func_name), i, args[i]);
+ parse_okay = false;
+ }
+ return parse_okay;
Index: pkgsrc/games/easyrpg-player/patches/patch-src_enemyai.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_enemyai.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_enemyai.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_enemyai.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/enemyai.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/enemyai.cpp
+@@ -60,7 +60,7 @@ std::unique_ptr<AlgorithmBase> CreateAlg
+ if (Utils::StrICmp(name, RpgRtCompat::name) != 0) {
+ static bool warned = false;
+ if (!warned) {
+- Output::Debug("Invalid AutoBattle algo name `{}' falling back to {} ...", name, RpgRtCompat::name);
++ Output::Debug("Invalid AutoBattle algo name `{}' falling back to {} ...", std::string(name), RpgRtCompat::name);
+ warned = true;
+ }
+ }
Index: pkgsrc/games/easyrpg-player/patches/patch-src_filefinder.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_filefinder.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_filefinder.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_filefinder.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/filefinder.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/filefinder.cpp
+@@ -172,7 +172,7 @@ std::string FileFinder::MakeCanonical(St
+ // Ignore, we are in root
+ --initial_deepness;
+ } else {
+- Output::Debug("Path traversal out of game directory: {}", path);
++ Output::Debug("Path traversal out of game directory: {}", std::string(path));
+ }
+ } else if (path_comp.empty() || path_comp == ".") {
+ // ignore
Index: pkgsrc/games/easyrpg-player/patches/patch-src_filefinder__rtp.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_filefinder__rtp.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_filefinder__rtp.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_filefinder__rtp.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/filefinder_rtp.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/filefinder_rtp.cpp
+@@ -170,7 +170,7 @@ void FileFinder_RTP::AddPath(StringView
+ using namespace FileFinder;
+ auto fs = FileFinder::Root().Create(FileFinder::MakeCanonical(p));
+ if (fs) {
+- Output::Debug("Adding {} to RTP path", p);
++ Output::Debug("Adding {} to RTP path", std::string(p));
+
+ auto hit_info = RTP::Detect(fs, Player::EngineVersion());
+
Index: pkgsrc/games/easyrpg-player/patches/patch-src_filesystem__root.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_filesystem__root.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_filesystem__root.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_filesystem__root.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/filesystem_root.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/filesystem_root.cpp
+@@ -111,7 +111,7 @@ const Filesystem& RootFilesystem::Filesy
+
+ if (it == fs_list.end()) {
+ // Only possible to trigger via commandline or bogus code, always user/dev error -> abort
+- Output::Error("Unsupported namespace {}://{}", ns, path);
++ Output::Error("Unsupported namespace {}://{}", std::string(ns), std::string(path));
+ }
+
+ return *it->second;
Index: pkgsrc/games/easyrpg-player/patches/patch-src_game__character.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_game__character.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_game__character.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_game__character.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/game_character.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/game_character.cpp
+@@ -50,7 +50,7 @@ void Game_Character::SanitizeMoveRoute(S
+ const auto n = static_cast<int32_t>(mr.move_commands.size());
+ if (idx < 0 || idx > n) {
+ idx = n;
+- Output::Warning("{} {}: Save Data invalid {}={}. Fixing ...", TypeToStr(_type), name, chunk_name, idx);
++ Output::Warning("{} {}: Save Data invalid {}={}. Fixing ...", TypeToStr(_type), std::string(name), std::string(chunk_name), idx);
+ }
+ }
+
Index: pkgsrc/games/easyrpg-player/patches/patch-src_game__interpreter.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_game__interpreter.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_game__interpreter.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_game__interpreter.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/game_interpreter.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/game_interpreter.cpp
+@@ -2102,7 +2102,7 @@ bool Game_Interpreter::CommandChangeVehi
+ Game_Vehicle* vehicle = Game_Map::GetVehicle(vehicle_id);
+
+ if (!vehicle) {
+- Output::Warning("ChangeVehicleGraphic: Invalid vehicle ID {}", vehicle_id);
++ Output::Warning("ChangeVehicleGraphic: Invalid vehicle ID {}", std::string(vehicle_id));
+ return true;
+ }
+
Index: pkgsrc/games/easyrpg-player/patches/patch-src_game__interpreter__map.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_game__interpreter__map.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_game__interpreter__map.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_game__interpreter__map.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/game_interpreter_map.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/game_interpreter_map.cpp
+@@ -406,7 +406,7 @@ bool Game_Interpreter_Map::CommandShowIn
+ );
+ }
+ else {
+- pm.PushLine(fmt::format("{} {}{} {}", greeting_1, inn_price, lcf::Data::terms.gold, greeting_2));
++ pm.PushLine(fmt::format("{} {}{} {}", std::string(greeting_1), inn_price, lcf::Data::terms.gold, std::string(greeting_2)));
+ pm.PushLine(ToString(greeting_3));
+ }
+
Index: pkgsrc/games/easyrpg-player/patches/patch-src_game__system.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_game__system.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_game__system.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_game__system.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/game_system.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/game_system.cpp
+@@ -510,7 +510,7 @@ void Game_System::OnBgmReady(FileRequest
+ if (StringView(result->file).ends_with(".link")) {
+ // Handle Ineluki's MP3 patch
+ if (!stream) {
+- Output::Warning("Ineluki MP3: Link read error: {}", stream.GetName());
++ Output::Warning("Ineluki MP3: Link read error: {}", std::string(stream.GetName()));
+ return;
+ }
+
Index: pkgsrc/games/easyrpg-player/patches/patch-src_meta.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_meta.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_meta.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_meta.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/meta.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/meta.cpp
+@@ -76,7 +76,7 @@ Meta::Meta(StringView meta_file) {
+ if (version == "1") {
+ IdentifyCanonName(TREEMAP_NAME, DATABASE_NAME);
+ } else {
+- Output::Warning("Metadata error in {}, format property {}:{} is missing or invalid: '{}'", meta_file, MTINI_EASY_RPG_SECTION, MTINI_FILE_FORMAT_VERSION, version);
++ Output::Warning("Metadata error in {}, format property {}:{} is missing or invalid: '{}'", std::string(meta_file), MTINI_EASY_RPG_SECTION, MTINI_FILE_FORMAT_VERSION, version);
+ ini = nullptr;
+ }
+ }
Index: pkgsrc/games/easyrpg-player/patches/patch-src_output.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_output.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_output.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_output.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/output.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/output.cpp
+@@ -304,7 +304,7 @@ bool Output::TakeScreenshot(StringView f
+ auto ret = FileFinder::Save().OpenOutputStream(file, std::ios_base::binary | std::ios_base::out | std::ios_base::trunc);
+
+ if (ret) {
+- Output::Debug("Saving Screenshot {}", file);
++ Output::Debug("Saving Screenshot {}", std::string(file));
+ return Output::TakeScreenshot(ret);
+ }
+ return false;
Index: pkgsrc/games/easyrpg-player/patches/patch-src_scene__battle__rpg2k.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_scene__battle__rpg2k.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_scene__battle__rpg2k.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_scene__battle__rpg2k.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/scene_battle_rpg2k.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/scene_battle_rpg2k.cpp
+@@ -1741,7 +1741,7 @@ void Scene_Battle_Rpg2k::CreateExecution
+
+ for (const auto& battler : battle_actions) {
+ if (std::count(battle_actions.begin(), battle_actions.end(), battler) > 1) {
+- Output::Warning("CreateExecutionOrder: Battler {} ({}) has multiple battle actions", battler->GetId(), battler->GetName());
++ Output::Warning("CreateExecutionOrder: Battler {} ({}) has multiple battle actions", battler->GetId(), std::string(battler->GetName()));
+ Output::Warning("Please report a bug!");
+ break;
+ }
Index: pkgsrc/games/easyrpg-player/patches/patch-src_scene__battle__rpg2k3.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_scene__battle__rpg2k3.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_scene__battle__rpg2k3.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_scene__battle__rpg2k3.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/scene_battle_rpg2k3.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/scene_battle_rpg2k3.cpp
+@@ -468,7 +468,7 @@ void Scene_Battle_Rpg2k3::UpdateAnimatio
+ help_window->Clear();
+ int state_counter = 0;
+ for (lcf::rpg::State* state : ordered_states) {
+- std::string state_name = fmt::format("{:9s}", state->name);
++ std::string state_name = fmt::format("{:9s}", std::string(state->name));
+ help_window->AddText(state_name, state->color, Text::AlignLeft, false);
+ if (++state_counter >= 5) break;
+ }
Index: pkgsrc/games/easyrpg-player/patches/patch-src_scene__debug.cpp
diff -u /dev/null pkgsrc/games/easyrpg-player/patches/patch-src_scene__debug.cpp:1.1
--- /dev/null Sun May 21 06:27:31 2023
+++ pkgsrc/games/easyrpg-player/patches/patch-src_scene__debug.cpp Sun May 21 06:27:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_scene__debug.cpp,v 1.1 2023/05/21 06:27:31 wiz Exp $
+
+Adapt for fmtlib 10.
+
+--- src/scene_debug.cpp.orig 2021-10-29 19:42:00.000000000 +0000
++++ src/scene_debug.cpp
+@@ -548,7 +548,7 @@ void Scene_Debug::UpdateRangeListWindow(
+ if (GetStackSize() > 3) {
+ auto* event = Game_Map::GetEvent(GetFrame(1).value);
+ if (event) {
+- addItem(fmt::format("{:04d}: {}", event->GetId(), event->GetName()));
++ addItem(fmt::format("{:04d}: {}", event->GetId(), std::string(event->GetName())));
+ addItem(fmt::format("NumPages: {}", event->GetNumPages()));
+ const auto* page = event->GetActivePage();
+ const auto page_id = page ? page->ID : 0;
Home |
Main Index |
Thread Index |
Old Index