Can't compile VLCKit failed to apply patch0002
Hi, It seems that merging src/interface/dialog.c failed with 2.7 and master, so the system cannot apply patch 0002. And so the compilation failed for the simulator. Here are the steps to reproduce :
- Clone the git repository https://code.videolan.org/videolan/VLCKit.git
- Run ./buildMobileVLCKit.sh -t (everything ok at the end)
- Run ./buildMobileVLCKit.sh -t -s And then you've got :
Applying: progress dialog: add missing sanity check Using index info to reconstruct a base tree... M src/interface/dialog.c Falling back to patching base and 3-way merge... Auto-merging src/interface/dialog.c CONFLICT (content): Merge conflict in src/interface/dialog.c Failed to merge in the changes. Patch failed at 0002 progress dialog: add missing sanity check
Thanks for help.