Date: Mon, 04 May 2026 12:19:05 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Stefan Schlosser <bsdcode@disroot.org> Subject: git: 4b7d9492feb8 - main - emulators/Ymir: Update 0.3.0 => 0.3.1 Message-ID: <69f88eb9.39705.29aac536@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b7d9492feb8a502cee763d3de151b4eb72772ea commit 4b7d9492feb8a502cee763d3de151b4eb72772ea Author: Stefan Schlosser <bsdcode@disroot.org> AuthorDate: 2026-05-04 12:16:10 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-05-04 12:18:57 +0000 emulators/Ymir: Update 0.3.0 => 0.3.1 * Upstream removed the Ymir_INCLUDE_PACKAGING build option, so the port removes it from CMAKE_OFF. * Ymir documents all dependencies in its "About" window. This also includes the vendored miniz from the vendored libchdr dependency and requires the version constant from miniz.h. This library is currently not available as a port and the Ymir port unbundles libchdr in the first place, which is also configured to use the system-provided libz instead of miniz. Therefore remove all miniz references to unbreak the build. Changelog: https://github.com/StrikerX3/Ymir/releases/tag/v0.3.1 PR: 294992 Sponsored by: UNIS Labs --- emulators/Ymir/Makefile | 5 ++--- emulators/Ymir/distinfo | 6 ++--- ..._ymir-sdl3_src_app_ui_windows_about__window.cpp | 26 ++++++++++++++++++---- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/emulators/Ymir/Makefile b/emulators/Ymir/Makefile index 886ce95e7c9e..2b2b9384a8b6 100644 --- a/emulators/Ymir/Makefile +++ b/emulators/Ymir/Makefile @@ -1,6 +1,6 @@ PORTNAME= Ymir DISTVERSIONPREFIX= v -DISTVERSION= 0.3.0 +DISTVERSION= 0.3.1 CATEGORIES= emulators MAINTAINER= bsdcode@disroot.org @@ -61,8 +61,7 @@ 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 \ 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,8 +1,18 @@ ---- 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 <zlib.h> + #include <zstd.h> + +-#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES +-#include <miniz/miniz.h> +- + #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 @@ -12,3 +22,11 @@ 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/"},home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f88eb9.39705.29aac536>