Skip to content

Commit ecff434

Browse files
cfsmp3claude
andcommitted
[FIX] Update vcpkg baseline and use forked rsmpeg for FFmpeg 7
Update vcpkg baseline from Feb 2024 to Dec 2025 to resolve libxml2 hash mismatch. GitLab regenerates archives dynamically, causing SHA512 verification failures with old baselines. Switch to CCExtractor's forked rsmpeg (github.com/CCExtractor/rsmpeg) which pins rusty_ffmpeg to 0.16.4 for FFmpeg 7.1 compatibility. This provides consistent FFmpeg 7 support across all platforms. Changes: - Update vcpkg baseline in workflow and vcpkg.json - Use forked rsmpeg from git for all platforms - Use ffmpeg7_1 feature instead of ffmpeg6/ffmpeg8 - Use link_vcpkg_ffmpeg for Windows 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 42d7509 commit ecff434

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/build_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44
RUSTFLAGS: -Ctarget-feature=+crt-static
55
VCPKG_DEFAULT_TRIPLET: x64-windows-static
66
VCPKG_DEFAULT_BINARY_CACHE: C:\vcpkg\.cache
7-
VCPKG_COMMIT: fba75d09065fcc76a25dcf386b1d00d33f5175af
7+
VCPKG_COMMIT: ab2977be50c702126336e5088f4836060733c899
88

99
on:
1010
workflow_dispatch:

src/rust/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ lib_ccxr = { path = "lib_ccxr" }
2626
url = "2.5.4"
2727
encoding_rs = "0.8.5"
2828

29-
# Use rsmpeg with platform-specific FFmpeg features and versions
29+
# Use CCExtractor's forked rsmpeg with FFmpeg 7 support
3030
[target.'cfg(target_os = "linux")'.dependencies]
31-
rsmpeg = { version = "0.14.2", default-features = false, features = ["ffmpeg6", "link_system_ffmpeg"], optional = true }
31+
rsmpeg = { git = "https://github.com/CCExtractor/rsmpeg.git", default-features = false, features = ["ffmpeg7_1", "link_system_ffmpeg"], optional = true }
3232

3333
[target.'cfg(target_os = "windows")'.dependencies]
34-
rsmpeg = { version = "0.14.2", default-features = false, features = ["ffmpeg6", "link_system_ffmpeg"], optional = true }
34+
rsmpeg = { git = "https://github.com/CCExtractor/rsmpeg.git", default-features = false, features = ["ffmpeg7_1", "link_vcpkg_ffmpeg"], optional = true }
3535

36-
# Fallback for other platforms (FreeBSD, etc.)
36+
# Fallback for other platforms (macOS, FreeBSD, etc.)
3737
[target.'cfg(not(any(target_os = "linux", target_os = "windows")))'.dependencies]
38-
rsmpeg = { version = "0.18.0", default-features = false, features = ["ffmpeg8", "link_system_ffmpeg"], optional = true }
38+
rsmpeg = { git = "https://github.com/CCExtractor/rsmpeg.git", default-features = false, features = ["ffmpeg7_1", "link_system_ffmpeg"], optional = true }
3939

4040
[build-dependencies]
4141
bindgen = "0.64.0"

windows/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"tesseract",
77
"ffmpeg"
88
],
9-
"builtin-baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af"
9+
"builtin-baseline": "ab2977be50c702126336e5088f4836060733c899"
1010
}

0 commit comments

Comments
 (0)