Skip to content

Commit a4dc4c1

Browse files
committed
Install pkgconf with Winget
1 parent 8f58950 commit a4dc4c1

2 files changed

Lines changed: 17 additions & 19 deletions

File tree

.github/workflows/ci-windows.yml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,27 @@ jobs:
3232
$vcpkg_path = Split-Path (Get-Command vcpkg).Source -Parent
3333
echo "VCPKG_PATH=$vcpkg_path" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
3434
35-
- name: Install pkgconf
36-
uses: msys2/setup-msys2@v2
37-
id: msys2
38-
with:
39-
msystem: UCRT64
40-
install: mingw-w64-ucrt-x86_64-pkgconf
41-
4235
- name: Setup MSVC Developer Command Prompt
4336
uses: ilammy/msvc-dev-cmd@v1
4437
with:
4538
arch: ${{ matrix.arch }}
4639

40+
- name: Install pkgconf
41+
run: |
42+
winget install pkgconf.pkgconf --accept-package-agreements --accept-source-agreements --disable-interactivity
43+
$pkgconfExePath = (Get-Command pkgconf).Source
44+
$pkgconfDirPath = Split-Path -Path $pkgconfExePath -Parent
45+
echo $pkgconfDirPath | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
46+
4747
- name: Configure with Meson
48-
env:
49-
PKG_CONFIG: "${{ steps.msys2.outputs.msys2-location }}\\ucrt64\\bin\\pkg-config.EXE"
50-
run: >
51-
meson setup builddir
52-
--buildtype=release
53-
--vsenv
54-
-Dtest=enabled
55-
-Davisynth=enabled
56-
--pkg-config-path="$env:VCPKG_PATH\installed\${{ matrix.arch }}-windows-static\lib\pkgconfig"
57-
-Db_vscrt=mt
48+
run: |
49+
meson setup builddir `
50+
--buildtype=release `
51+
--vsenv `
52+
-Dtest=enabled `
53+
-Davisynth=enabled `
54+
--pkg-config-path="$env:VCPKG_PATH\installed\${{ matrix.arch }}-windows-static\lib\pkgconfig" `
55+
-Db_vscrt=mt
5856
# Use "-Db_vscrt=mt" to avoid this warning: LINK : warning LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs; use /NODEFAULTLIB:library
5957

6058
- name: Build

doc/ffms2-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ You can build both FFmpeg and FFMS2 with MinGW-w64, FFmpeg with clang-cl and FFM
3131

3232
These days building everything with MinGW works without doing anything unusual.
3333

34-
If you wanna use clang-cl or VC++, you will need to install pkgconf, so meson can found where you installed ffmpeg.
35-
The easiest way is to download the latest pkgconf `.msi` from their [CI](https://github.com/pkgconf/pkgconf/actions?query=branch:master).
34+
If you want to use clang-cl or VC++, you will need to install pkgconf, so meson can find where you installed FFmpeg.
35+
You can install pkgconf from the `.msi` which is available [here](https://github.com/pkgconf/pkgconf/releases/latest/), or use [WinGet](https://learn.microsoft.com/en-us/windows/package-manager/winget/) (`winget install pkgconf.pkgconf`), or use [Scoop](https://scoop.sh/) (`scoop install main/pkgconf`).
3636

3737
[ffmpeg]: http://www.ffmpeg.org
3838
[zlib]: http://www.zlib.net

0 commit comments

Comments
 (0)