[Milhouse]

Thanks for testing! I also had a conflict in xbmc/interfaces/json-rpc/schema/methods.json - if it was only partly applied, it could've been possible that it didn't work from JSON, as my git-am failed to handle it too.

(I've rephrased my post to be more clear just before you replied.)

Guess I got lucky on methods.json, as both patches applied cleanly

Code:

00h02m38s:           APPLY PATCH (project)   /home/neil/projects/OpenELEC.tv/projects/RPi/patches/xbmc/0194_NJM_fixjson_start.patch
00h02m38s: patching file xbmc/interfaces/json-rpc/schema/version.txt
00h02m38s:           APPLY PATCH (project)   /home/neil/projects/OpenELEC.tv/projects/RPi/patches/xbmc/0195_NJM_pr5324.patch
00h02m38s: patching file xbmc/Application.cpp
00h02m38s: Hunk #1 succeeded at 5593 (offset -21 lines).
00h02m38s: Hunk #2 succeeded at 5625 (offset -21 lines).
00h02m38s: Hunk #3 succeeded at 5652 (offset -21 lines).
00h02m38s: patching file xbmc/Application.h
00h02m38s: Hunk #1 succeeded at 245 (offset 1 line).
00h02m38s: patching file xbmc/cdrip/CDDARipper.cpp
00h02m38s: patching file xbmc/interfaces/Builtins.cpp
00h02m38s: Hunk #1 succeeded at 1401 (offset 1 line).
00h02m38s: Hunk #2 succeeded at 1438 (offset 1 line).
00h02m38s: patching file xbmc/music/MusicDatabase.cpp
00h02m38s: patching file xbmc/music/MusicDatabase.h
00h02m38s: patching file xbmc/music/windows/GUIWindowMusicBase.cpp
00h02m38s: patching file xbmc/video/windows/GUIWindowVideoBase.cpp
00h02m38s: Hunk #1 succeeded at 2029 (offset 9 lines).
00h02m38s: Hunk #2 succeeded at 2111 (offset 9 lines).
00h02m38s:           APPLY PATCH (project)   /home/neil/projects/OpenELEC.tv/projects/RPi/patches/xbmc/0196_NJM_pr5324.patch
00h02m38s: patching file xbmc/interfaces/json-rpc/AudioLibrary.cpp
00h02m38s: patching file xbmc/interfaces/json-rpc/VideoLibrary.cpp
00h02m38s: patching file xbmc/interfaces/json-rpc/schema/methods.json
00h02m38s: Hunk #1 succeeded at 930 (offset 5 lines).
00h02m38s: Hunk #2 succeeded at 963 (offset 5 lines).
00h02m38s: Hunk #3 succeeded at 1499 (offset 5 lines).
00h02m38s: Hunk #4 succeeded at 1533 (offset 5 lines).
00h02m38s: patching file xbmc/interfaces/json-rpc/schema/version.txt
00h02m38s:           APPLY PATCH (project)   /home/neil/projects/OpenELEC.tv/projects/RPi/patches/xbmc/0197_NJM_fixjson_end.patch
00h02m38s: patching file xbmc/interfaces/json-rpc/schema/version.txt

Other than the version bump (and different hunk offsets) I'm not seeing any difference between commit 7dd18bc84 that I used, and the updated commit d8a2b6d9 now on the PR, so I think we're good.

The other commit 9b939b55 that I used from your PR at the time of the build shows no difference with what you have now, other than hunk offset changes and the addition of comments in Application.h.