diff options
| -rw-r--r-- | repo/packages/c/c4core/patches/0.2.1/cmake-deps.patch | 29 | ||||
| -rw-r--r-- | repo/packages/c/c4core/xmake.lua | 59 | ||||
| -rw-r--r-- | repo/packages/r/ryml/xmake.lua | 44 | ||||
| -rw-r--r-- | thirdparty/Oodle/include/oodle2.h | 5 | ||||
| -rw-r--r-- | thirdparty/Oodle/include/oodle2base.h | 4 | ||||
| -rw-r--r-- | thirdparty/Oodle/lib/Linux_arm64/liboo2corelinuxarm64.a | bin | 0 -> 1106600 bytes | |||
| -rwxr-xr-x | thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.a | bin | 9261046 -> 9258796 bytes | |||
| -rw-r--r-- | thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.so.9 | bin | 688096 -> 0 bytes | |||
| -rwxr-xr-x | thirdparty/Oodle/lib/Mac_x64/liboo2coremac64.a | bin | 10679216 -> 10927512 bytes | |||
| -rw-r--r-- | thirdparty/Oodle/lib/Win64/oo2core_win64.lib | bin | 9491760 -> 9473194 bytes | |||
| -rw-r--r-- | thirdparty/Oodle/lib/WinArm64/oo2core_winuwparm64.lib | bin | 0 -> 8341576 bytes |
11 files changed, 5 insertions, 136 deletions
diff --git a/repo/packages/c/c4core/patches/0.2.1/cmake-deps.patch b/repo/packages/c/c4core/patches/0.2.1/cmake-deps.patch deleted file mode 100644 index c7132c1b4..000000000 --- a/repo/packages/c/c4core/patches/0.2.1/cmake-deps.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea146a8..31373e5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -69,14 +69,12 @@ set(C4CORE_SRC_FILES - c4/windows_push.hpp - c4/c4core.natvis - # -- c4/ext/debugbreak/debugbreak.h - c4/ext/rng/rng.hpp - c4/ext/sg14/inplace_function.h - ) - if(C4CORE_WITH_FASTFLOAT) - list(APPEND C4CORE_SRC_FILES - c4/ext/fast_float.hpp -- c4/ext/fast_float_all.h - ) - endif() - set(C4CORE_AMALGAMATED ${C4CORE_SRC_DIR}/../src_singleheader/c4/c4core_all.hpp) -@@ -97,6 +95,9 @@ c4_add_library(c4core - ) - if(NOT C4CORE_WITH_FASTFLOAT) - target_compile_definitions(c4core PUBLIC -DC4CORE_NO_FAST_FLOAT) -+else() -+ find_package(FastFloat REQUIRED CONFIG) -+ target_link_libraries(c4core PUBLIC "FastFloat::fast_float") - endif() - if(C4CORE_NO_DEBUG_BREAK) - target_compile_definitions(c4core PUBLIC -DC4_NO_DEBUG_BREAK)
\ No newline at end of file diff --git a/repo/packages/c/c4core/xmake.lua b/repo/packages/c/c4core/xmake.lua deleted file mode 100644 index 734b5771d..000000000 --- a/repo/packages/c/c4core/xmake.lua +++ /dev/null @@ -1,59 +0,0 @@ -package("c4core") - set_homepage("https://github.com/biojppm/c4core") - set_description("C++ utilities") - set_license("MIT") - - add_urls("https://github.com/biojppm/c4core/releases/download/v$(version)/c4core-$(version)-src.zip", - "https://github.com/biojppm/c4core.git") - - add_versions("0.2.2", "5a9508385daa5b2608ed007784d76586af21c5367411efe9ae26d5b4aea03305") - add_versions("0.2.1", "81ff1c0d15e24da6d76fdd1b6fdd903fa23d0df7c82e564f993147a4dac88773") - - add_configs("fast_float", {description = "use fastfloat to parse floats", default = false, type = "boolean"}) - add_configs("debugbreak", {description = "use debug break in debug builds", default = false, type = "boolean"}) - - add_deps("cmake") - - on_load(function (package) - if package:config("fast_float") then - package:add("deps", "fast_float") - else - package:add("defines", "C4CORE_NO_FAST_FLOAT") - end - if package:config("debugbreak") then - package:add("deps", "debugbreak") - else - package:add("defines", "C4_NO_DEBUG_BREAK") - end - - if package:config("fast_float") or package:config("debugbreak") then - package:add("patches", ">=0.2.1", "patches/0.2.1/cmake-deps.patch", "92c0c6510cc3b8cbd10b575b5b9d0defa2a19d19f24c1618a73d4f4636da4c9b") - end - end) - - on_install(function (package) - if package:config("fast_float") then - io.replace("src/c4/ext/fast_float.hpp", "c4/ext/fast_float_all.h", "fast_float/fast_float.h", {plain = true}) - end - if package:config("debugbreak") then - io.replace("src/c4/error.hpp", "c4/ext/debugbreak/debugbreak.h", "debugbreak.h", {plain = true}) - end - - local configs = {} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) - table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - table.insert(configs, "-DC4CORE_WITH_FASTFLOAT=" .. (package:config("fast_float") and "ON" or "OFF")) - table.insert(configs, "-DC4CORE_NO_DEBUG_BREAK=" .. (package:config("debugbreak") and "OFF" or "ON")) - import("package.tools.cmake").install(package, configs, {packagedeps = "debugbreak"}) - end) - - --[==[ - on_test(function (package) - assert(package:check_cxxsnippets({test = [[ - void test() { - double value; - c4::from_chars("52.4354", &value); - } - ]]}, {configs = {languages = "c++11"}, includes = "c4/charconv.hpp"})) - end) - --]==] diff --git a/repo/packages/r/ryml/xmake.lua b/repo/packages/r/ryml/xmake.lua deleted file mode 100644 index 8997d4bd8..000000000 --- a/repo/packages/r/ryml/xmake.lua +++ /dev/null @@ -1,44 +0,0 @@ -package("ryml") - set_kind("library", {headeronly = true}) - set_homepage("https://github.com/biojppm/rapidyaml") - set_description("Rapid YAML - a library to parse and emit YAML, and do it fast") - set_license("MIT") - - add_urls("https://github.com/biojppm/rapidyaml.git") - add_versions("v0.5.0", "b35ccb150282760cf5c2d316895cb86bd161ac89") - add_deps("cmake") - - on_install("windows|x64", "linux", "macosx", function (package) - os.vrun("git -c core.fsmonitor=false submodule foreach --recursive git checkout") - - if false then - local configs = {} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - - import("package.tools.cmake").install(package, configs) - else - io.writefile("xmake.lua", [[ - set_version("$(version)") - add_rules("mode.debug", "mode.release") - target("ryml") - set_kind("static") - set_languages("cxx20") - add_files("src/**.cpp") - add_files("ext/c4core/src/c4/*.cpp") - remove_files("ext/c4core/src/**/tests/*.cpp") - add_headerfiles("src/*.hpp") - add_headerfiles("src/(c4/yml/**.hpp)") - add_headerfiles("ext/c4core/src/(c4/**.hpp)") - add_headerfiles("ext/c4core/src/(c4/**.h)") - - add_includedirs("src", {public=true}) - add_includedirs("ext/c4core/src") - ]]) - local configs = {} - import("package.tools.xmake").install(package, configs) - end - end) - - on_test(function (package) - end) diff --git a/thirdparty/Oodle/include/oodle2.h b/thirdparty/Oodle/include/oodle2.h index 85315e384..d8805b134 100644 --- a/thirdparty/Oodle/include/oodle2.h +++ b/thirdparty/Oodle/include/oodle2.h @@ -26,12 +26,12 @@ // the DLL is incompatible when MAJOR is bumped // MINOR is for internal revs and bug fixes that don't affect API compatibility #define OODLE2_VERSION_MAJOR 9 -#define OODLE2_VERSION_MINOR 14 +#define OODLE2_VERSION_MINOR 15 // OodleVersion string is 1 . MAJOR . MINOR // don't make it from macros cuz the doc tool has to parse the string literal -#define OodleVersion "2.9.14" /* +#define OodleVersion "2.9.15" /* */ //----------------------------------------------------- @@ -1522,6 +1522,7 @@ OOFUNC1 OO_SINTa OOFUNC2 OodleLZ_GetCompressedBufferSizeNeeded(OodleLZ_Compresso note this is actually larger than the maximum size of a compressed stream, it includes overrun padding. + note rawSize should be >= 1 ; OodleLZ_Compress will fail on rawSize = 0 and GetCompressedBufferSizeNeeded will return zero */ // decBuf needs to be a little larger than rawLen, diff --git a/thirdparty/Oodle/include/oodle2base.h b/thirdparty/Oodle/include/oodle2base.h index 0f5f99025..3db768587 100644 --- a/thirdparty/Oodle/include/oodle2base.h +++ b/thirdparty/Oodle/include/oodle2base.h @@ -1,7 +1,7 @@ //=================================================== // Oodle2 Base header -// (C) Copyright 1994-2025 Epic Games Tools LLC +// (C) Copyright 1994-2026 Epic Games Tools LLC //=================================================== #ifndef __OODLE2BASE_H_INCLUDED__ @@ -23,7 +23,7 @@ #include <stdint.h> -#define OOCOPYRIGHT "Copyright (C) 1994-2025, Epic Games Tools LLC" +#define OOCOPYRIGHT "Copyright (C) 1994-2026, Epic Games Tools LLC" // Typedefs typedef int8_t OO_S8; diff --git a/thirdparty/Oodle/lib/Linux_arm64/liboo2corelinuxarm64.a b/thirdparty/Oodle/lib/Linux_arm64/liboo2corelinuxarm64.a Binary files differnew file mode 100644 index 000000000..b1c5ce79b --- /dev/null +++ b/thirdparty/Oodle/lib/Linux_arm64/liboo2corelinuxarm64.a diff --git a/thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.a b/thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.a Binary files differindex 152fa7bef..4848db940 100755 --- a/thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.a +++ b/thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.a diff --git a/thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.so.9 b/thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.so.9 Binary files differdeleted file mode 100644 index d26e64933..000000000 --- a/thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.so.9 +++ /dev/null diff --git a/thirdparty/Oodle/lib/Mac_x64/liboo2coremac64.a b/thirdparty/Oodle/lib/Mac_x64/liboo2coremac64.a Binary files differindex 284d9bf01..059e0a8ed 100755 --- a/thirdparty/Oodle/lib/Mac_x64/liboo2coremac64.a +++ b/thirdparty/Oodle/lib/Mac_x64/liboo2coremac64.a diff --git a/thirdparty/Oodle/lib/Win64/oo2core_win64.lib b/thirdparty/Oodle/lib/Win64/oo2core_win64.lib Binary files differindex 0995e623d..97488fb21 100644 --- a/thirdparty/Oodle/lib/Win64/oo2core_win64.lib +++ b/thirdparty/Oodle/lib/Win64/oo2core_win64.lib diff --git a/thirdparty/Oodle/lib/WinArm64/oo2core_winuwparm64.lib b/thirdparty/Oodle/lib/WinArm64/oo2core_winuwparm64.lib Binary files differnew file mode 100644 index 000000000..bbb0e3850 --- /dev/null +++ b/thirdparty/Oodle/lib/WinArm64/oo2core_winuwparm64.lib |