|
22 | 22 | choco install -y --no-progress nasm ninja llvm pkgconfiglite | Out-Null |
23 | 23 | echo "C:\Program Files\NASM" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8 |
24 | 24 | echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8 |
| 25 | + # pkgconfiglite installs pkg-config.exe to the choco bin — put it on the |
| 26 | + # NATIVE windows PATH so cmake's find_package(PkgConfig) sets PKG_CONFIG_FOUND |
| 27 | + echo "C:\ProgramData\chocolatey\bin" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8 |
| 28 | + Get-Command pkg-config | Select-Object -ExpandProperty Source |
25 | 29 | - name: build shared FFmpeg 8.1.2 prefix (MSVC) for cmake videoio discovery |
26 | 30 | shell: msys2 {0} |
27 | 31 | run: | |
@@ -59,16 +63,19 @@ jobs: |
59 | 63 | set -eux |
60 | 64 | # windows-native pkg-config (pkgconfiglite) + the ffmpeg prefix's .pc; skip |
61 | 65 | # OpenCV's prebuilt-dll download so it uses our built shared FFmpeg. |
62 | | - export PKG_CONFIG="$(command -v pkg-config)" |
| 66 | + # Pass a WINDOWS-style path to cmake (a /c/ unix path leaves PKG_CONFIG_FOUND |
| 67 | + # false → OpenCV's pkg-config FFmpeg branch never runs). PKG_CONFIG_PATH is |
| 68 | + # inherited by cmake's pkg-config invocations. |
| 69 | + PKGCFG_WIN="$(cygpath -w "$(command -v pkg-config)")" |
63 | 70 | export PKG_CONFIG_PATH="C:/ffprefix/lib/pkgconfig" |
64 | | - echo "pkg-config: $PKG_CONFIG"; ls -la C:/ffprefix/lib/pkgconfig/ || true |
65 | | - "$PKG_CONFIG" --exists libavcodec libavformat libavutil libswscale \ |
66 | | - && echo "pkg-config sees ffmpeg: avcodec $("$PKG_CONFIG" --modversion libavcodec)" \ |
| 71 | + echo "pkg-config (win path): $PKGCFG_WIN"; ls -la C:/ffprefix/lib/pkgconfig/ || true |
| 72 | + pkg-config --exists libavcodec libavformat libavutil libswscale \ |
| 73 | + && echo "pkg-config sees ffmpeg: avcodec $(pkg-config --modversion libavcodec)" \ |
67 | 74 | || echo "WARN pkg-config missing some ffmpeg .pc" |
68 | 75 | cmake -G Ninja -S "$OPENCV_SRC" -B bld \ |
69 | 76 | -DCMAKE_BUILD_TYPE=Release \ |
70 | 77 | -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl \ |
71 | | - -DPKG_CONFIG_EXECUTABLE="$PKG_CONFIG" \ |
| 78 | + -DPKG_CONFIG_EXECUTABLE="$PKGCFG_WIN" \ |
72 | 79 | -DBUILD_LIST=core,imgproc,imgcodecs,highgui,videoio \ |
73 | 80 | -DBUILD_SHARED_LIBS=OFF -DBUILD_ZLIB=ON -DBUILD_PNG=ON -DBUILD_JPEG=ON \ |
74 | 81 | -DENABLE_LIBJPEG_TURBO_SIMD=OFF \ |
|
0 commit comments