Skip to content

Commit ae2d627

Browse files
cfsmp3claude
andcommitted
Use platform-appropriate FFmpeg versions
- Linux: FFmpeg 6 (from Ubuntu apt packages) - Windows: FFmpeg 7 (from vcpkg with recent baseline) - macOS: FFmpeg 7 (from Homebrew) This fixes the Windows build which was failing due to vcpkg baseline hash mismatch for libxml2 in older baselines. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 64b095b commit ae2d627

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
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: 5a58e645cefaae63d149ff50fc1ca1ec54c47a77
7+
VCPKG_COMMIT: ab2977be50c702126336e5088f4836060733c899
88

99
on:
1010
workflow_dispatch:

src/rust/Cargo.toml

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

29-
# Use CCExtractor's forked rsmpeg with FFmpeg 6 support
30-
# FFmpeg 6.1.1 is used consistently across all platforms:
31-
# - Linux: apt packages (libavcodec-dev, etc.)
32-
# - Windows: vcpkg with baseline pinned to FFmpeg 6.1.1
33-
# - macOS: Homebrew ffmpeg@6
29+
# Use CCExtractor's forked rsmpeg
30+
# - Linux: FFmpeg 6 from apt packages
31+
# - Windows: FFmpeg 7 from vcpkg
32+
# - macOS: FFmpeg 7 from Homebrew
3433
[target.'cfg(target_os = "linux")'.dependencies]
3534
rsmpeg = { git = "https://github.com/CCExtractor/rsmpeg.git", default-features = false, features = ["ffmpeg6", "link_system_ffmpeg"], optional = true }
3635

3736
[target.'cfg(target_os = "windows")'.dependencies]
38-
rsmpeg = { git = "https://github.com/CCExtractor/rsmpeg.git", default-features = false, features = ["ffmpeg6", "link_vcpkg_ffmpeg"], optional = true }
37+
rsmpeg = { git = "https://github.com/CCExtractor/rsmpeg.git", default-features = false, features = ["ffmpeg7", "link_vcpkg_ffmpeg"], optional = true }
3938

40-
# Fallback for other platforms (macOS, FreeBSD, etc.)
39+
# macOS and other platforms use FFmpeg 7
4140
[target.'cfg(not(any(target_os = "linux", target_os = "windows")))'.dependencies]
42-
rsmpeg = { git = "https://github.com/CCExtractor/rsmpeg.git", default-features = false, features = ["ffmpeg6", "link_system_ffmpeg"], optional = true }
41+
rsmpeg = { git = "https://github.com/CCExtractor/rsmpeg.git", default-features = false, features = ["ffmpeg7", "link_system_ffmpeg"], optional = true }
4342

4443
[build-dependencies]
4544
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": "5a58e645cefaae63d149ff50fc1ca1ec54c47a77"
9+
"builtin-baseline": "ab2977be50c702126336e5088f4836060733c899"
1010
}

0 commit comments

Comments
 (0)