Can't build MobileVLCKit from '2.1-stable' branch
Runs for a while, then dies applying a patch to something:
... ~/src/vlc/VLCKit-stable/MobileVLCKit/ImportedSources/vlc/extras/package/ios [info] Building MobileVLCKit (Aggregate static plugins, Release) [info] Building MobileVLCKit (MobileVLCKit, Release) [info] Build completed [info] Preparing build dirs First, rewinding head to replay your work on top of it... Applying: Add secure transport TLS module Applying: arm_neon: added function macro to handle the underscore prefix for the iOS ARM ABI Applying: arm_neon: use a macro to fix compilation for iOS Applying: deinterlace/merge: use a macro to fix compilation for iOS Applying: contrib/ebml+mkv: compile with hidden symbols on iOS Applying: posix/thread: add a hack to work-around crashes when using the buggy iOS 6 runtime Applying: freetype: added a fake font lookup mechanism for iOS to use the packaged demo fonts Applying: libass: fix text rendering on iOS by providing a font lookup mechanism for the font shipped with Aspen Applying: contrib/png: fix ARM assembly for iOS Applying: deinterlace: added a hack to work-around a libtool bug Applying: extras: deploy arch option for iOS Applying: contrib/speex: fix compilation for arm64 Applying: contrib/flac: fix compilation with clang 5.0 Applying: contrib/gcrypt: use git version on iOS Applying: lib/media_player: inherit deinterlace and vbi variables to fix correct variables values on first use Applying: contrib: don't try to guess ARCH if it was given as an argument Applying: contrib/opus disable asm on arm Applying: contrib: fix iOS simulator architecture features Applying: contrib/avcodec: deploy libav and a post-arm64 hash Using index info to reconstruct a base tree... M contrib/src/ffmpeg/rules.mak Falling back to patching base and 3-way merge... Auto-merging contrib/src/ffmpeg/rules.mak CONFLICT (content): Merge conflict in contrib/src/ffmpeg/rules.mak Failed to merge in the changes. Patch failed at 0019 contrib/avcodec: deploy libav and a post-arm64 hash The copy of the patch that failed is found in: /Users/brion/src/vlc/VLCKit-stable/MobileVLCKit/ImportedSources/vlc/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort".