From 16927f0e7e1a19b973450e1de7cef01a980c03d8 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Mon, 13 Jul 2026 13:59:06 +0100 Subject: [PATCH] bump(vpkmerge): 0.9.0 --- _sources/generated.json | 8 +- _sources/generated.nix | 8 +- .../Cargo.lock | 219 +++++++++++++++++- 3 files changed, 223 insertions(+), 12 deletions(-) rename _sources/{sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8= => sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=}/Cargo.lock (96%) diff --git a/_sources/generated.json b/_sources/generated.json index a22509a..385cad0 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -234,7 +234,7 @@ "vpkmerge": { "cargoLock": { "Cargo.lock": [ - "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock", + "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock", {} ] }, @@ -250,11 +250,11 @@ "name": null, "owner": "Slush97", "repo": "vpkmerge", - "rev": "v0.7.0", - "sha256": "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8=", + "rev": "v0.19.0", + "sha256": "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=", "sparseCheckout": [], "type": "github" }, - "version": "v0.7.0" + "version": "v0.19.0" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 3003bb8..3b4bbd8 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -147,16 +147,16 @@ }; vpkmerge = { pname = "vpkmerge"; - version = "v0.7.0"; + version = "v0.19.0"; src = fetchFromGitHub { owner = "Slush97"; repo = "vpkmerge"; - rev = "v0.7.0"; + rev = "v0.19.0"; fetchSubmodules = false; - sha256 = "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8="; + sha256 = "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw="; }; cargoLock."Cargo.lock" = { - lockFile = ./. + "/sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock"; + lockFile = ./. + "/sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock"; outputHashes = { }; diff --git a/_sources/sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock b/_sources/sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock similarity index 96% rename from _sources/sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock rename to _sources/sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock index bc6a2d8..b71c22f 100644 --- a/_sources/sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock +++ b/_sources/sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock @@ -8,6 +8,23 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom 0.2.17", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "1.1.4" @@ -536,6 +553,25 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.21" @@ -816,6 +852,12 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" +[[package]] +name = "either" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" + [[package]] name = "embed-resource" version = "3.0.9" @@ -869,6 +911,32 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" +[[package]] +name = "fbxcel" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f9e966e38cb462819635792e0a9ee1d6cc5fff9bcdbf7baefb350221a7ae3df" +dependencies = [ + "indextree", + "libflate", + "log", + "string-interner", +] + +[[package]] +name = "fbxcel-dom" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84d1dcac5735ee4aa4b56758ae8446c55ee6f00b2041e31f5303c338b8e0ec6a" +dependencies = [ + "anyhow", + "fbxcel", + "log", + "mint", + "rgb", + "string-interner", +] + [[package]] name = "fdeflate" version = "0.3.7" @@ -1373,6 +1441,15 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -1697,6 +1774,30 @@ dependencies = [ "serde_core", ] +[[package]] +name = "indextree" +version = "4.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cee462cd93b03891663339b59a21246cc5fc2cc95060d0bb5059e25cd50edc4" +dependencies = [ + "indextree-macros", +] + +[[package]] +name = "indextree-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f85dac6c239acc85fd61934c572292d93adfd2de459d9c032aa22b553506e915" +dependencies = [ + "either", + "itertools", + "proc-macro2", + "quote", + "strum", + "syn 2.0.117", + "thiserror 2.0.18", +] + [[package]] name = "infer" version = "0.19.0" @@ -1743,6 +1844,15 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.18" @@ -1912,6 +2022,26 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libflate" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" +dependencies = [ + "adler32", + "crc32fast", + "libflate_lz77", +] + +[[package]] +name = "libflate_lz77" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" +dependencies = [ + "rle-decode-fast", +] + [[package]] name = "libloading" version = "0.7.4" @@ -2012,6 +2142,12 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + [[package]] name = "mio" version = "1.2.0" @@ -2025,7 +2161,7 @@ dependencies = [ [[package]] name = "morphic" -version = "0.3.0" +version = "0.10.0" dependencies = [ "bcdec_rs", "bitflags 2.11.1", @@ -2037,6 +2173,7 @@ dependencies = [ "image", "intel_tex_2", "lz4_flex", + "rayon", "ruzstd", "serde", "serde_json", @@ -2661,6 +2798,26 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" +[[package]] +name = "rayon" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_syscall" version = "0.5.18" @@ -2788,6 +2945,21 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "rgb" +version = "0.8.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b34b781b31e5d73e9fbc8689c70551fd1ade9a19e3e28cfec8580a79290cc4" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "rle-decode-fast" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + [[package]] name = "rustc-hash" version = "2.1.2" @@ -3190,6 +3362,16 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +[[package]] +name = "string-interner" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e2531d8525b29b514d25e275a43581320d587b86db302b9a7e464bac579648" +dependencies = [ + "cfg-if", + "hashbrown 0.11.2", +] + [[package]] name = "string_cache" version = "0.9.0" @@ -3220,6 +3402,27 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "strum" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "swift-rs" version = "1.0.7" @@ -4136,21 +4339,28 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vpkmerge-cli" -version = "0.7.0" +version = "0.19.0" dependencies = [ "anyhow", "clap", "serde", "serde_json", + "tempfile", "vpkmerge-core", ] [[package]] name = "vpkmerge-core" -version = "0.7.0" +version = "0.19.0" dependencies = [ "anyhow", + "fbxcel", + "fbxcel-dom", + "gltf", + "image", "morphic", + "quick-xml", + "serde", "serde_json", "tempfile", "valve_pak", @@ -4158,7 +4368,7 @@ dependencies = [ [[package]] name = "vpkmerge-gui" -version = "0.6.0" +version = "0.17.1" dependencies = [ "base64 0.22.1", "half", @@ -4169,6 +4379,7 @@ dependencies = [ "tauri", "tauri-build", "tauri-plugin-dialog", + "tempfile", "valve_pak", "vpkmerge-core", ] -- 2.54.0