git: 2ef96c82c051 - main - emulators/Ymir: Update 0.1.6 => 0.1.7

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2ef96c82c051d6fe39a194f90ea92905a5d24ff7

commit 2ef96c82c051d6fe39a194f90ea92905a5d24ff7
Author:     Stefan Schlosser <bsdcode@disroot.org>
AuthorDate: 2025-08-11 21:58:22 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-08-11 22:02:20 +0000

    emulators/Ymir: Update 0.1.6 => 0.1.7
    
    Changelog:
    https://github.com/StrikerX3/Ymir/releases/tag/v0.1.7
    
    - Remove patch qith support devel/libfmt 10.x after update it 11.2.0.
    - Unbreak on aarch64 - require llvm21.
    
    PR:     288782
---
 emulators/Ymir/Makefile                            |  9 ++++----
 emulators/Ymir/distinfo                            |  6 ++---
 .../files/patch-apps_ymir-sdl3_src_app_app.cpp     | 26 +++-------------------
 3 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/emulators/Ymir/Makefile b/emulators/Ymir/Makefile
index 189eb6ec438c..b6cfa0301e45 100644
--- a/emulators/Ymir/Makefile
+++ b/emulators/Ymir/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	Ymir
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.6
+DISTVERSION=	0.1.7
 CATEGORIES=	emulators
 
 MAINTAINER=	bsdcode@disroot.org
@@ -10,9 +10,6 @@ WWW=		https://github.com/StrikerX3/Ymir/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_aarch64=		https://github.com/StrikerX3/Ymir/pull/389 \
-			https://github.com/StrikerX3/Ymir/pull/421 \
-			https://github.com/llvm/llvm-project/issues/69524
 ONLY_FOR_ARCHS=		aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	upstream only supports aarch64 and amd64
 
@@ -41,7 +38,9 @@ _gtk4_BR_DEPENDS=		zenity:x11/zenity4
 ${FLAVOR}_BUILD_DEPENDS=	${_${FLAVOR}_BR_DEPENDS}
 ${FLAVOR}_RUN_DEPENDS=		${_${FLAVOR}_BR_DEPENDS}
 
-USES=		cmake compiler:c++20-lang gl llvm pkgconfig sdl xorg
+USES=		cmake compiler:c++20-lang desktop-file-utils gl \
+		llvm${_LLVM_${ARCH}} pkgconfig sdl xorg
+_LLVM_aarch64=	:min=21
 USE_GITHUB=	yes
 GH_ACCOUNT=	StrikerX3
 GH_TUPLE=	StrikerX3:mio:c9dbe3a6f74b2c2c4a6c9621005c3df213a33eaa:mio/vendor/mio
diff --git a/emulators/Ymir/distinfo b/emulators/Ymir/distinfo
index b691a23ad4f4..78b5b3eb2cee 100644
--- a/emulators/Ymir/distinfo
+++ b/emulators/Ymir/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1754444444
-SHA256 (StrikerX3-Ymir-v0.1.6_GH0.tar.gz) = 810b445dff2b9c1d055e9d701cfac3d9fc90edeb95e72e985d864e8acd7c5f37
-SIZE (StrikerX3-Ymir-v0.1.6_GH0.tar.gz) = 4842645
+TIMESTAMP = 1754870707
+SHA256 (StrikerX3-Ymir-v0.1.7_GH0.tar.gz) = 8453407de50a4abef05c985f4eabf32b5185bf5a651583d250f820ff60bae93a
+SIZE (StrikerX3-Ymir-v0.1.7_GH0.tar.gz) = 5431708
 SHA256 (StrikerX3-mio-c9dbe3a6f74b2c2c4a6c9621005c3df213a33eaa_GH0.tar.gz) = 384d3a3ee249ebda0766fa5dc9f8bc5a871c8b2e3d3eedf46f330e6350058738
 SIZE (StrikerX3-mio-c9dbe3a6f74b2c2c4a6c9621005c3df213a33eaa_GH0.tar.gz) = 34871
diff --git a/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_app.cpp b/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_app.cpp
index 8cf268ad80d7..fc08ed1ec905 100644
--- a/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_app.cpp
+++ b/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_app.cpp
@@ -1,7 +1,7 @@
---- apps/ymir-sdl3/src/app/app.cpp.orig	2025-07-20 22:35:27 UTC
+--- apps/ymir-sdl3/src/app/app.cpp.orig	2025-08-11 00:12:19 UTC
 +++ apps/ymir-sdl3/src/app/app.cpp
-@@ -108,8 +108,8 @@
- #include <SDL3/SDL_filesystem.h>
+@@ -114,8 +114,8 @@
+ #include <SDL3/SDL_messagebox.h>
  #include <SDL3/SDL_misc.h>
  
 -#include <backends/imgui_impl_sdl3.h>
@@ -11,23 +11,3 @@
  
  #include <imgui.h>
  
-@@ -1898,8 +1898,18 @@ void App::RunEmulator() {
-                                                       actions::save_states::GetLoadStateAction(i),
-                                                       actions::save_states::GetSaveStateAction(i));
-
-+#if FMT_VERSION < 110000
-+                                char timeStr[20];
-+                                tm timeTm = util::to_local_time(state.timestamp);
-+                                if (!strftime(timeStr, sizeof(timeStr), "%F %T", &timeTm)) {
-+                                    memset(timeStr, 0, sizeof(timeStr));
-+                                }
-+#else
-+                                tm timeStr = util::to_local_time(state.timestamp);
-+#endif
-+
-                                 if (ImGui::MenuItem(
--                                        fmt::format("{}: {}", i, util::to_local_time(state.timestamp)).c_str(),
-+                                        fmt::format("{}: {}", i, timeStr).c_str(),
-                                         shortcut.c_str(), m_context.currSaveStateSlot == i, true)) {
-                                     if (io.KeyShift) {
-                                         SaveSaveStateSlot(i);