Skip to content

Commit c4b8c32

Browse files
committed
Update Windows CI to use FFmpeg 7.1.1 with matching rsmpeg version
- Update vcpkg baseline to 120deac3062162151622ca4860575a33844ba10b which provides FFmpeg 7.1.1 - Update Windows CI to use rsmpeg 0.17.0+ffmpeg.7.1 which exactly matches the FFmpeg version from vcpkg - This provides a more recent FFmpeg version while still maintaining compatibility
1 parent e3a84d9 commit c4b8c32

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/build_windows.yml

Lines changed: 5 additions & 5 deletions
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: 120deac3062162151622ca4860575a33844ba10b
88

99
on:
1010
workflow_dispatch:
@@ -58,10 +58,10 @@ jobs:
5858
override: true
5959
- name: Install Win 10 SDK
6060
uses: ilammy/msvc-dev-cmd@v1
61-
- name: Downgrade rsmpeg for FFmpeg 6.x compatibility
61+
- name: Downgrade rsmpeg for FFmpeg 7.1.1 compatibility
6262
shell: powershell
6363
run: |
64-
(Get-Content src\rust\Cargo.toml) -replace 'rsmpeg = \{ version = "0.18.0\+ffmpeg.8.0"', 'rsmpeg = { version = "0.14.2+ffmpeg.6.1"' | Set-Content src\rust\Cargo.toml
64+
(Get-Content src\rust\Cargo.toml) -replace 'rsmpeg = \{ version = "0.18.0\+ffmpeg.8.0"', 'rsmpeg = { version = "0.17.0+ffmpeg.7.1"' | Set-Content src\rust\Cargo.toml
6565
- name: build Release-Full
6666
env:
6767
LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
@@ -113,10 +113,10 @@ jobs:
113113
override: true
114114
- name: Install Win 10 SDK
115115
uses: ilammy/msvc-dev-cmd@v1
116-
- name: Downgrade rsmpeg for FFmpeg 6.x compatibility
116+
- name: Downgrade rsmpeg for FFmpeg 7.1.1 compatibility
117117
shell: powershell
118118
run: |
119-
(Get-Content src\rust\Cargo.toml) -replace 'rsmpeg = \{ version = "0.18.0\+ffmpeg.8.0"', 'rsmpeg = { version = "0.14.2+ffmpeg.6.1"' | Set-Content src\rust\Cargo.toml
119+
(Get-Content src\rust\Cargo.toml) -replace 'rsmpeg = \{ version = "0.18.0\+ffmpeg.8.0"', 'rsmpeg = { version = "0.17.0+ffmpeg.7.1"' | Set-Content src\rust\Cargo.toml
120120
- name: build Debug-Full
121121
env:
122122
LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"

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": "120deac3062162151622ca4860575a33844ba10b"
1010
}

0 commit comments

Comments
 (0)