kodi: 17.4 -> 17.6 and move to cmake #29830
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
peterhoeg
changed the title
|
Upgrade to 17.5 works fine but test suite still takes about 4 hours to run (and has a few failures). |
domenkozar
reviewed
Oct 25, 2017
|
|
||
| let | ||
| kodi_version = "17.4"; | ||
| kodiReleaseDate = "20170422"; | ||
| kodiVersion = "17.4"; |
There was a problem hiding this comment.
@domenkozar - it's probably easier for everyone involved if I push the right branch...
edwtjo
approved these changes
Oct 27, 2017
|
Thanks @edwtjo - this PR disables the checks and I want to be sure everybody is cool with that. |
ffmpeg is now built as a separate derivation using the kodi makefile to avoid having to rebuild ffmpeg every time kodi is changed. Additionally, due to the far superior cmake output a number of dependencies were identified that have been added as well.
peterhoeg
changed the title
|
Supersedes #31787 if everyone is cool with this. |
|
It has a number of security patches (specifically with regards to ffmpeg) - we should probably backport this to 17.09. I'll do later during the weekend. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Working on kodi was quite painful as it would rebuild ffmpeg every time. ffmpeg is now built as a separate derivation using the kodi makefile to avoid having to rebuild ffmpeg every time kodi is changed.
Additionally, due to the far superior cmake output a number of dependencies were identified that have been added as well.
This PR compiles but the tests fail (at least no more segfaulting). The main issue with troubleshooting the tests is that they take FOREVER to run now - approximately 4 hours as each test takes 30 seconds. My guess is that there is a timeout of some kind due to our sandbox.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)Cc: @domenkozar @titanous @edwtjo @joachifm