shinchiro/mpv-winbuild-cmake

libsrt patch failed at 0001 avoid name collision

Closed this issue · 2 comments

I have an issue similar to #233. ninja mpv fails on Ubuntu 22.04 when building the software the second time:

[220/521] Performing patch step for 'libsrt'
FAILED: packages/libsrt-prefix/src/libsrt-stamp/libsrt-patch /root/mpv-winbuild-cmake/build64/packages/libsrt-prefix/src/libsrt-stamp/libsrt-patch
cd /root/mpv-winbuild-cmake/build64/packages/libsrt-prefix/src/libsrt && /root/mpv-winbuild-cmake/build64/exec git am --3way "/root/mpv-winbuild-cmake/packages/libsrt-*.patch" && /usr/bin/cmake -E touch /root/mpv-winbuild-cmake/build64/packages/libsrt-prefix/src/libsrt-stamp/libsrt-patch
Applying: avoid name collision
error: sha1 information is lacking or useless (CMakeLists.txt).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 avoid name collision
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".0

After finding #250, I tried removing ./packages/libsrt-0001-avoid-name-collision.patch, which solved the error for me. Since I'm not an expert on these things, it would be nice if someone could give an opinion whether this is a sustainable approach or not?

Do ninja libsrt-fullclean to reset the repo