diff --git a/.github/workflows/main-1.19.1.yml b/.github/workflows/main-1.19.1.yml index 74b98f54..d0e3d647 100644 --- a/.github/workflows/main-1.19.1.yml +++ b/.github/workflows/main-1.19.1.yml @@ -24,9 +24,9 @@ env: # GIT: Fix reporting from stderr to stdout GIT_REDIRECT_STDERR: 2>&1 # Tools versions - _WINGET_CMAKE: 3.29.5 - _WINGET_POWERSHELL: 7.4.2 - _WINGET_VS2022: 17.10.2 + _WINGET_CMAKE: 3.30.1 + _WINGET_POWERSHELL: 7.4.4 + _WINGET_VS2022: 17.10.5 jobs: FFNx: diff --git a/.vcpkg/ports/bgfx/portfile.cmake b/.vcpkg/ports/bgfx/portfile.cmake index e6ebf9af..3e435952 100644 --- a/.vcpkg/ports/bgfx/portfile.cmake +++ b/.vcpkg/ports/bgfx/portfile.cmake @@ -6,22 +6,22 @@ vcpkg_from_github(OUT_SOURCE_PATH BX_SOURCE_DIR REPO "julianxhokaxhiu/bx" HEAD_REF master - REF e3ebb936fb9f37e9025af79e5db1f04a22205494 - SHA512 fa98c6e5b276dfea7266a30abb3877cdcd7f29e0c37a70a1924180b47818ac26a817a60e696601b67be90112d416473ed22c3196b8aa8ad132f75bb6a62cb076 + REF ba882e5864c94dcacf6ba623b8e71249a88448c6 + SHA512 1d23a85520dcb1676799623d71a591a093d197f159791a544b6a8571c7fed1a1735545a5aab7679437daa4fa6d51ccdae59f3ea1cf8471296a0eebb93de5953e ) vcpkg_from_github(OUT_SOURCE_PATH BIMG_SOURCE_DIR REPO "julianxhokaxhiu/bimg" HEAD_REF master - REF 98a40e85334721446bbc2efe7bd4576d37952136 - SHA512 3af1c94ac60a740d3c1ed75bf52d527a3ff327ec6f33b7d1e906d79f8a5736dfc182a078b2d9bcaa96c6cb1b9adc62dc6141a889ab611a0e95db8ab0c0a5f21b + REF aaf9125234e657393f504404a279289669d89fcb + SHA512 f7437227b84b3bcdc603d7ebe0831091a273061b7cd85b8b68c1ca4f94d6e5a9150e1386608e5d4a6304aad828b1f8439ac09316133a55d5545eeb3d24d3bc98 ) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_DIR REPO "julianxhokaxhiu/bgfx" HEAD_REF master - REF a7438f6cc6d96a112d2556c22c51579b4c930568 - SHA512 ce98e44e52351a03c28e0e7076ffd66d1c5a34392227ef37ac8ddee4f9c2f46d609678c35073e91eed8587919fecc4febc5c7f08003ad18f8ad2457194b7bfaf + REF 7c58f2aa1e4af85c69d818cb166bd8a4e39361a5 + SHA512 7887d21987d940be40fcce7508e81cde6b83f2316dfbfe4546c951bb014e9071b02199d87b7ec21f08f1888efb133ea1fe0adcc1e4ba91d6dac80fc90be184a5 ) # Move bx source inside bgfx source tree diff --git a/.vcpkg/ports/bimg/portfile.cmake b/.vcpkg/ports/bimg/portfile.cmake index 45669033..5f4cf9ac 100644 --- a/.vcpkg/ports/bimg/portfile.cmake +++ b/.vcpkg/ports/bimg/portfile.cmake @@ -6,15 +6,15 @@ vcpkg_from_github(OUT_SOURCE_PATH BX_SOURCE_DIR REPO "julianxhokaxhiu/bx" HEAD_REF master - REF e3ebb936fb9f37e9025af79e5db1f04a22205494 - SHA512 fa98c6e5b276dfea7266a30abb3877cdcd7f29e0c37a70a1924180b47818ac26a817a60e696601b67be90112d416473ed22c3196b8aa8ad132f75bb6a62cb076 + REF ba882e5864c94dcacf6ba623b8e71249a88448c6 + SHA512 1d23a85520dcb1676799623d71a591a093d197f159791a544b6a8571c7fed1a1735545a5aab7679437daa4fa6d51ccdae59f3ea1cf8471296a0eebb93de5953e ) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_DIR REPO "julianxhokaxhiu/bimg" HEAD_REF master - REF 98a40e85334721446bbc2efe7bd4576d37952136 - SHA512 3af1c94ac60a740d3c1ed75bf52d527a3ff327ec6f33b7d1e906d79f8a5736dfc182a078b2d9bcaa96c6cb1b9adc62dc6141a889ab611a0e95db8ab0c0a5f21b + REF aaf9125234e657393f504404a279289669d89fcb + SHA512 f7437227b84b3bcdc603d7ebe0831091a273061b7cd85b8b68c1ca4f94d6e5a9150e1386608e5d4a6304aad828b1f8439ac09316133a55d5545eeb3d24d3bc98 ) # Move bx source inside bgfx source tree diff --git a/.vcpkg/ports/bx/portfile.cmake b/.vcpkg/ports/bx/portfile.cmake index 50766f23..1f2bd0a1 100644 --- a/.vcpkg/ports/bx/portfile.cmake +++ b/.vcpkg/ports/bx/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_DIR REPO "julianxhokaxhiu/bx" HEAD_REF master - REF e3ebb936fb9f37e9025af79e5db1f04a22205494 - SHA512 fa98c6e5b276dfea7266a30abb3877cdcd7f29e0c37a70a1924180b47818ac26a817a60e696601b67be90112d416473ed22c3196b8aa8ad132f75bb6a62cb076 + REF ba882e5864c94dcacf6ba623b8e71249a88448c6 + SHA512 1d23a85520dcb1676799623d71a591a093d197f159791a544b6a8571c7fed1a1735545a5aab7679437daa4fa6d51ccdae59f3ea1cf8471296a0eebb93de5953e ) # Set up GENie (custom project generator) diff --git a/.vcpkg/ports/vgmstream/cmake.patch b/.vcpkg/ports/vgmstream/cmake.patch index abab8454..fb3ab69e 100644 --- a/.vcpkg/ports/vgmstream/cmake.patch +++ b/.vcpkg/ports/vgmstream/cmake.patch @@ -9,7 +9,7 @@ index f34fe127..539deb44 100644 if(CMAKE_SYSTEM_NAME MATCHES Darwin) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3e707614..1dcd6a42 100644 +index 3e707614..f653a75e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -90,3 +90,30 @@ if(NOT EMSCRIPTEN) @@ -38,28 +38,27 @@ index 3e707614..1dcd6a42 100644 + install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/util/log.h DESTINATION include/libvgmstream/util ) + install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/util/reader_get.h DESTINATION include/libvgmstream/util ) + install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/util/reader_put.h DESTINATION include/libvgmstream/util ) ++ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/util/vgmstream_limits.h DESTINATION include/libvgmstream/util ) + install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/streamtypes.h DESTINATION include/libvgmstream ) + install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/streamfile.h DESTINATION include/libvgmstream ) + install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/coding/g72x_state.h DESTINATION include/libvgmstream/coding ) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/coding/nwa_decoder.h DESTINATION include/libvgmstream/coding ) +endif() -diff --git a/src/streamfile.c b/src/streamfile.c -index 183c76bc..171812c4 100644 ---- a/src/streamfile.c -+++ b/src/streamfile.c -@@ -260,8 +260,10 @@ static STREAMFILE* open_stdio_streamfile_buffer_by_file(FILE* infile, const char - this_sf->buf = buf; +diff --git a/src/base/streamfile_stdio.c b/src/base/streamfile_stdio.c +index 948f5ffc..a3dc25b0 100644 +--- a/src/base/streamfile_stdio.c ++++ b/src/base/streamfile_stdio.c +@@ -264,7 +264,10 @@ static STREAMFILE* open_stdio_streamfile_buffer_by_file(FILE* infile, const char this_sf->name_len = strlen(filename); -- if (this_sf->name_len >= sizeof(this_sf->name)) -+ if (this_sf->name_len >= sizeof(this_sf->name)) { + if (this_sf->name_len >= sizeof(this_sf->name)) ++ { + vgm_logi("STREAMFILE: filename length is longer than sizeof(this_sf->name).\n"); goto fail; + } memcpy(this_sf->name, filename, this_sf->name_len); this_sf->name[this_sf->name_len] = '\0'; -@@ -301,6 +303,7 @@ static STREAMFILE* open_stdio_streamfile_buffer_by_file(FILE* infile, const char +@@ -304,6 +307,7 @@ static STREAMFILE* open_stdio_streamfile_buffer_by_file(FILE* infile, const char return &this_sf->vt; fail: diff --git a/.vcpkg/ports/vgmstream/portfile.cmake b/.vcpkg/ports/vgmstream/portfile.cmake index 4d44da2e..bef6e013 100644 --- a/.vcpkg/ports/vgmstream/portfile.cmake +++ b/.vcpkg/ports/vgmstream/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "vgmstream/vgmstream" HEAD_REF master - REF r1917 - SHA512 4ec48e0de333d55629bcd1f3e548c5703686cb6d46cf18ccb0dd004b1c4f9154cb3f89f9b9fd454c008df645722ad5323eb01374bf2fa82975732d93eaa0aae4 + REF e79e0bad3fe32ded496220385debc83cc8c4fb03 + SHA512 0482623a77a03262a65023a5e5f8436c508bf5e127d9580642a8e67fc3b2a95182066ffe857253914c231273028755296de9e711bd3db784536c32e4a2fa443d PATCHES cmake.patch ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f384d87..1871d1fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,6 +176,7 @@ target_compile_options( PRIVATE /DNOMINMAX PRIVATE /Zc:strictStrings- PRIVATE /Zc:__cplusplus + PRIVATE /Zc:preprocessor PRIVATE /Qpar PRIVATE /MP ) diff --git a/src/log.h b/src/log.h index a7941dec..4d61707f 100644 --- a/src/log.h +++ b/src/log.h @@ -25,16 +25,16 @@ #include "common.h" #include "globals.h" -#define ffnx_error(x, ...) debug_printf("ERROR", text_colors[TEXTCOLOR_RED], (x), __VA_ARGS__) -#define ffnx_warning(x, ...) debug_printf("WARNING", text_colors[TEXTCOLOR_YELLOW], (x), __VA_ARGS__) -#define ffnx_info(x, ...) debug_printf("INFO", text_colors[TEXTCOLOR_WHITE], (x), __VA_ARGS__) -#define ffnx_dump(x, ...) debug_printf("DUMP", text_colors[TEXTCOLOR_PINK], (x), __VA_ARGS__) -#define ffnx_trace(x, ...) debug_printf("TRACE", text_colors[TEXTCOLOR_GREEN], (x), __VA_ARGS__) -#define ffnx_glitch(x, ...) debug_printf("GLITCH", text_colors[TEXTCOLOR_GRAY], (x), __VA_ARGS__) -#define ffnx_unexpected(x, ...) debug_printf("UNEXPECTED", text_colors[TEXTCOLOR_LIGHT_BLUE], (x), __VA_ARGS__) - -#define ffnx_glitch_once(x, ...) { static uint32_t glitch_ ## __LINE__ = false; if(!glitch_ ## __LINE__) { ffnx_glitch(x, __VA_ARGS__); glitch_ ## __LINE__ = true; } } -#define ffnx_unexpected_once(x, ...) { static uint32_t unexpected_ ## __LINE__ = false; if(!unexpected_ ## __LINE__) { ffnx_unexpected(x, __VA_ARGS__); unexpected_ ## __LINE__ = true; } } +#define ffnx_error(x, ...) debug_printf("ERROR", text_colors[TEXTCOLOR_RED], (x), ## __VA_ARGS__) +#define ffnx_warning(x, ...) debug_printf("WARNING", text_colors[TEXTCOLOR_YELLOW], (x), ## __VA_ARGS__) +#define ffnx_info(x, ...) debug_printf("INFO", text_colors[TEXTCOLOR_WHITE], (x), ## __VA_ARGS__) +#define ffnx_dump(x, ...) debug_printf("DUMP", text_colors[TEXTCOLOR_PINK], (x), ## __VA_ARGS__) +#define ffnx_trace(x, ...) debug_printf("TRACE", text_colors[TEXTCOLOR_GREEN], (x), ## __VA_ARGS__) +#define ffnx_glitch(x, ...) debug_printf("GLITCH", text_colors[TEXTCOLOR_GRAY], (x), ## __VA_ARGS__) +#define ffnx_unexpected(x, ...) debug_printf("UNEXPECTED", text_colors[TEXTCOLOR_LIGHT_BLUE], (x), ## __VA_ARGS__) + +#define ffnx_glitch_once(x, ...) { static uint32_t glitch_ ## __LINE__ = false; if(!glitch_ ## __LINE__) { ffnx_glitch(x, ## __VA_ARGS__); glitch_ ## __LINE__ = true; } } +#define ffnx_unexpected_once(x, ...) { static uint32_t unexpected_ ## __LINE__ = false; if(!unexpected_ ## __LINE__) { ffnx_unexpected(x, ## __VA_ARGS__); unexpected_ ## __LINE__ = true; } } void open_applog(char *path); diff --git a/vcpkg.json b/vcpkg.json index 3d6a219c..c825899b 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffnx", "version": "1.19.1", - "builtin-baseline": "a4275b7eee79fb24ec2e135481ef5fce8b41c339", + "builtin-baseline": "1de2026f28ead93ff1773e6e680387643e914ea1", "dependencies": [ "bgfx", { @@ -76,27 +76,27 @@ { "name": "ffmpeg", "version": "6.1.1", - "port-version": 6 + "port-version": 10 }, { "name": "imgui", - "version": "1.90.6", - "port-version": 0 + "version": "1.90.7", + "port-version": 1 }, { "name": "libpng", "version": "1.6.43", - "port-version": 1 + "port-version": 2 }, { "name": "directxtex", - "version": "2024-03-06", + "version": "2024-06-04", "port-version": 0 }, { "name": "mimalloc", "version": "2.1.2", - "port-version": 2 + "port-version": 3 }, { "name": "openpsf",