diff --git a/emulators/Ymir/Makefile b/emulators/Ymir/Makefile index 886ce95e7c9e..2b2b9384a8b6 100644 --- a/emulators/Ymir/Makefile +++ b/emulators/Ymir/Makefile @@ -1,105 +1,104 @@ PORTNAME= Ymir DISTVERSIONPREFIX= v -DISTVERSION= 0.3.0 +DISTVERSION= 0.3.1 CATEGORIES= emulators MAINTAINER= bsdcode@disroot.org COMMENT= Sega Saturn emulator WWW= https://github.com/StrikerX3/Ymir/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= upstream only supports aarch64 and amd64 BUILD_DEPENDS= cereal>0:devel/cereal \ concurrentqueue>0:devel/concurrentqueue \ cxxopts>0:devel/cxxopts \ date>0:devel/date \ glslangValidator:graphics/glslang \ glslc:graphics/shaderc \ libnghttp3>0:www/libnghttp3 \ libngtcp2>0:net/libngtcp2 \ nlohmann-json>0:devel/nlohmann-json \ semver>0:devel/semver \ stb>0:devel/stb \ vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libchdr.so:devel/libchdr \ libcurl.so:ftp/curl \ libfmt.so:devel/libfmt \ libglfw.so:graphics/glfw \ libimgui.so:x11-toolkits/imgui \ liblz4.so:archivers/liblz4 \ librtmidi.so:audio/rtmidi \ libtomlplusplus.so:devel/tomlplusplus \ libvulkan.so:graphics/vulkan-loader \ libxxhash.so:devel/xxhash FLAVORS= gtk3 gtk4 FLAVOR?= ${FLAVORS:[1]} gtk4_PKGNAMESUFFIX= -gtk4 _gtk3_BR_DEPENDS= zenity:x11/zenity _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${_LLVM_${ARCH}} localbase \ pkgconfig sdl xorg _LLVM_aarch64= :min=21 USE_GITHUB= yes GH_ACCOUNT= StrikerX3 GH_TUPLE= StrikerX3:mio:4e4cdc711d73d9dc96c0cb9475e6951f476218e6:mio/vendor/mio USE_GL= glut USE_SDL= sdl3 USE_XORG= xi xmu CMAKE_OFF= Ymir_DEV_BUILD \ Ymir_ENABLE_IMGUI_DEMO \ Ymir_ENABLE_SANDBOX \ Ymir_ENABLE_TESTS \ - Ymir_ENABLE_UPDATE_CHECKS \ - Ymir_INCLUDE_PACKAGING + Ymir_ENABLE_UPDATE_CHECKS CFLAGS+= -I${LOCALBASE}/include/concurrentqueue/moodycamel \ -I${LOCALBASE}/include/stb \ -I${WRKSRC}/vendor/imgui/ymir PLIST_FILES= bin/ymir-sdl3 \ share/applications/io.github.strikerx3.ymir.desktop \ share/icons/hicolor/256x256/apps/ymir.png \ share/metainfo/io.github.strikerx3.ymir.xml OPTIONS_DEFINE= FEATUREFLAG LTO YMDASM OPTIONS_DEFAULT= LTO FEATUREFLAG_DESC= Enable experimental features YMDASM_DESC= Include Ymir disassembly tool FEATUREFLAG_CMAKE_BOOL= Ymir_FEATUREFLAG_DEFAULT LTO_CMAKE_BOOL= Ymir_ENABLE_IPO YMDASM_CMAKE_BOOL= Ymir_ENABLE_YMDASM YMDASM_PLIST_FILES= bin/ymdasm post-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/apps/ymir-sdl3/ymir-sdl3-${DISTVERSION} \ ${STAGEDIR}${PREFIX}/bin/ymir-sdl3 ${INSTALL_DATA} ${WRKSRC}/apps/ymir-sdl3/res/io.github.strikerx3.ymir.desktop \ ${STAGEDIR}${DESKTOPDIR} ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps \ ${STAGEDIR}${PREFIX}/share/metainfo ${INSTALL_DATA} ${WRKSRC}/apps/ymir-sdl3/res/ymir.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps ${INSTALL_DATA} ${WRKSRC}/apps/ymir-sdl3/res/io.github.strikerx3.ymir.xml \ ${STAGEDIR}${PREFIX}/share/metainfo post-install-YMDASM-on: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/apps/ymdasm/ymdasm-${DISTVERSION} \ ${STAGEDIR}${PREFIX}/bin/ymdasm .include diff --git a/emulators/Ymir/distinfo b/emulators/Ymir/distinfo index 4b9f446b772e..d37edbc77d25 100644 --- a/emulators/Ymir/distinfo +++ b/emulators/Ymir/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1777015299 -SHA256 (StrikerX3-Ymir-v0.3.0_GH0.tar.gz) = 1a133f657e3d8649a2cc7988c6b3256cbe105121fc6b3b99c44976150bf4f5ab -SIZE (StrikerX3-Ymir-v0.3.0_GH0.tar.gz) = 6415140 +TIMESTAMP = 1777834029 +SHA256 (StrikerX3-Ymir-v0.3.1_GH0.tar.gz) = 6b9a9bcce71cc01eef720ec93725938c93dea5ba17e5506bb626c2c373408776 +SIZE (StrikerX3-Ymir-v0.3.1_GH0.tar.gz) = 6416921 SHA256 (StrikerX3-mio-4e4cdc711d73d9dc96c0cb9475e6951f476218e6_GH0.tar.gz) = 5da72ba39d70edab8cc42075c40895758c4a4ad905f9254ed5fd216757331773 SIZE (StrikerX3-mio-4e4cdc711d73d9dc96c0cb9475e6951f476218e6_GH0.tar.gz) = 34878 diff --git a/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_ui_windows_about__window.cpp b/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_ui_windows_about__window.cpp index a42fe54d23b6..40945de1765a 100644 --- a/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_ui_windows_about__window.cpp +++ b/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_ui_windows_about__window.cpp @@ -1,14 +1,32 @@ ---- apps/ymir-sdl3/src/app/ui/windows/about_window.cpp.orig 2025-10-14 17:56:52 UTC +--- apps/ymir-sdl3/src/app/ui/windows/about_window.cpp.orig 2026-05-03 13:13:03 UTC +++ apps/ymir-sdl3/src/app/ui/windows/about_window.cpp -@@ -48,6 +48,11 @@ - #define ZLIB_VERSION "1.3.1" // Private dependency of libchdr - #define ZSTD_VERSION "1.5.6" // Private dependency of libchdr +@@ -32,9 +32,6 @@ + #include + #include + +-#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES +-#include +- + #define _STR_IMPL(x) #x + #define _STR(x) _STR_IMPL(x) + #define _SEMVER_STR(major, minor, patch) _STR(major.minor.patch) +@@ -60,6 +57,11 @@ + #define TOMLPP_VERSION _SEMVER_STR(TOML_LIB_MAJOR, TOML_LIB_MINOR, TOML_LIB_PATCH) + #define XXHASH_VERSION _SEMVER_STR(XXH_VERSION_MAJOR, XXH_VERSION_MINOR, XXH_VERSION_RELEASE) +// Needed on 13.5, openssl in base is too old +#ifndef OPENSSL_FULL_VERSION_STR +#define OPENSSL_FULL_VERSION_STR OPENSSL_VERSION_TEXT +#endif + static const std::string fmtVersion = std::to_string(FMT_VERSION / 10000) + "." + std::to_string(FMT_VERSION / 100 % 100) + "." + std::to_string(FMT_VERSION % 100); +@@ -121,7 +123,6 @@ static const struct { + {.name = "lz4", .version = LZ4_VERSION_STRING, .license = licenseBSD2, .repoURL = "https://github.com/lz4/lz4", .licenseURL = "https://github.com/lz4/lz4/blob/dev/lib/LICENSE", .homeURL = "https://lz4.org/",}, + {.name = "lzma", .version = LZMA_VERSION, .license = licensePublicDomain, .homeURL = "https://www.7-zip.org/sdk.html",}, + {.name = "mio", .version = MIO_VERSION, .license = licenseMIT, .repoURL = "https://github.com/StrikerX3/mio", .licenseURL = "https://github.com/StrikerX3/mio/blob/master/LICENSE"}, +- {.name = "miniz", .version = MZ_VERSION, .license = licenseMIT, .repoURL = "https://github.com/richgel999/miniz", .licenseURL = "https://github.com/richgel999/miniz/blob/master/LICENSE"}, + {.name = "moodycamel::\nConcurrentQueue", .version = "\n" MC_CONCQUEUE_VERSION, .license = licenseBSD2, .repoURL = "https://github.com/cameron314/concurrentqueue", .licenseURL = "https://github.com/cameron314/concurrentqueue/blob/master/LICENSE.md"}, + {.name = "Neargye/semver", .version = SEMVER_VERSION, .license = licenseMIT, .repoURL = "https://github.com/Neargye/semver", .licenseURL = "https://github.com/Neargye/semver/blob/master/LICENSE"}, + {.name = "nghttp2", .version = NGHTTP2_VERSION, .license = licenseMIT, .repoURL = "https://github.com/nghttp2/nghttp2", .licenseURL = "https://github.com/nghttp2/nghttp2/blob/master/COPYING", .homeURL = "https://nghttp2.org/"},