From e73617daab66b7f4cea779109bcaa3de407897a9 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 16 Nov 2023 16:08:16 +0100 Subject: [PATCH] CI Win Cineform: do not copy .pc file After previous commit, UG configure finds the .pc file because the file was copied incorrectly before - it is copied to /usr/local/lib/pkgconfig, which was perhaps not a directory, creating file _named_ pkgconfig instead the file inside that dir. Interestingly this didn't look like it influenced other libraries, that might also want to copy its files to something, that was then file. But the contents is not usable without adjustnments: 1. prefix is C:/Program Files/CineFormSDK 2. lib is set to -lCFHDCodecShared in the PC file, but generated library has name just CFHDCodec (something similar as already solved by 0001-CMakeList.txt-remove-output-lib-name-force-UNIX.patch) While the pkg-config file was not used previously, it is perhaps easiest to leave it as it used to be instead of trying to fix the .pc file. --- .github/scripts/Windows/install_cineform.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/scripts/Windows/install_cineform.sh b/.github/scripts/Windows/install_cineform.sh index 6fc52888a8..04319f5a77 100755 --- a/.github/scripts/Windows/install_cineform.sh +++ b/.github/scripts/Windows/install_cineform.sh @@ -28,12 +28,13 @@ build() {( )} install() {( - mkdir -p /usr/local/bin /usr/local/include /usr/local/lib/pkgconfig + mkdir -p /usr/local/bin /usr/local/include /usr/local/lib cd /c/cineform-sdk/build cp Release/CFHDCodec.dll /usr/local/bin/ cp Release/CFHDCodec.lib /usr/local/lib/ cp ../Common/* /usr/local/include/ cp libcineformsdk.pc /usr/local/lib/pkgconfig/ + # mkdir /usr/local/lib/pkgconfig; cp libcineformsdk.pc /usr/local/lib/pkgconfig/ )} $1