shinchiro/mpv-winbuild-cmake

libssh patch failed

Closed this issue · 0 comments

[17/78] Performing patch step for 'libssh'
FAILED: packages/libssh-prefix/src/libssh-stamp/libssh-patch /__w/mpv-winbuild/mpv-winbuild/mpv-winbuild-cmake/build64/packages/libssh-prefix/src/libssh-stamp/libssh-patch 
cd /__w/mpv-winbuild/mpv-winbuild/mpv-winbuild-cmake/src_packages/libssh && /__w/mpv-winbuild/mpv-winbuild/mpv-winbuild-cmake/build64/exec git am --3way "/__w/mpv-winbuild/mpv-winbuild/mpv-winbuild-cmake/packages/libssh-*.patch" && /usr/bin/cmake -E touch /__w/mpv-winbuild/mpv-winbuild/mpv-winbuild-cmake/build64/packages/libssh-prefix/src/libssh-stamp/libssh-patch
Applying: Install modified .pc file
Applying: avoid name collision
Applying: upgrade to mbedtls v3
Using index info to reconstruct a base tree...
M	src/pki_mbedcrypto.c
Falling back to patching base and 3-way merge...
Auto-merging src/pki_mbedcrypto.c
CONFLICT (content): Merge conflict in src/pki_mbedcrypto.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 upgrade to mbedtls v3
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".