Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kodi: use kodi fork of libdvdnav/libdvdread. Fix #24153 (dvd playback) #24571

Merged
merged 1 commit into from Apr 11, 2017

Conversation

jbgi
Copy link
Contributor

@jbgi jbgi commented Apr 2, 2017

Motivation for this change

The Kodi project has forked libdvdnav and libdvdread to include kodi specific support. See http://forum.kodi.tv/printthread.php?tid=294976
Dvd playback in kodi does not work with upstream libdvdnav/libdvdread.

Things done
  • Built on platform(s)
    • Linux
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@jbgi, thanks for your PR! By analyzing the history of the files in this pull request, we identified @domenkozar, @edwtjo and @peterhoeg to be potential reviewers.

@joachifm
Copy link
Contributor

joachifm commented Apr 2, 2017

cc @titanous

@Mic92 Mic92 added the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 2, 2017
@cpages
Copy link
Contributor

cpages commented Apr 2, 2017

Is there a reason why you didn't pick the forked libdvdcss as well? Also, travis seems to fail building kodi due to some linking error. Can you double check? Thanks!

@jbgi
Copy link
Contributor Author

jbgi commented Apr 3, 2017

I cannot see why travis is failing. My machine is on 17.03, could that be the reason why I cannot reproduce the failure of nix-build -A kodiPlain -A kodi -A kodiPlugins.pvr-hts?

As for libdvdcss I did not use kodi fork, as their commits do not look like to be kodi-specific but just fixes/improvement that should be send to the upstream project. The upstream project did not want kodi "fixes" and is still actively maintained, with many commits ahead of kodi fork, potentially fixing same/more issues than the fork.

@cpages
Copy link
Contributor

cpages commented Apr 3, 2017

Heh, that's what happens with master on my machine:

[ RUN      ] TestJobManager.AddJob
/nix/store/fibk8jc2iwswn1q1d7aw98pcw2l3lzjf-bash-4.4-p12/bin/bash: line 1: 31312 Segmentation fault      /tmp/nix-build-kodi-17.1.drv-0/xbmc-17.1-Krypton/$check_program
make: *** [Makefile:618: check] Error 139
builder for ‘/nix/store/wj1a5rahrn40d3s4bgi3s9ljhx0g4zx3-kodi-17.1.drv’ failed with exit code 2
error: build of ‘/nix/store/wj1a5rahrn40d3s4bgi3s9ljhx0g4zx3-kodi-17.1.drv’ failed
The invocation of "nix-build -A kodiPlugins.pvr-hts -A kodiPlain -A kodi /home/page/dev/nixpkgs" failed

So it built kodi but segfaults in a test. Can you test on master and see what do you get?
Also, would be nice if you can add a small comment making it clear that we're picking the forks cause otherwise dvd playback does not work.

@Mic92 Mic92 merged commit 58771c4 into NixOS:master Apr 11, 2017
@Mic92
Copy link
Member

Mic92 commented Apr 11, 2017

The crash seems to be no longer an issue.

@jbgi
Copy link
Contributor Author

jbgi commented Apr 19, 2017

@Mic92 can you also backport the fix to 17.03?

@cpages
Copy link
Contributor

cpages commented Apr 22, 2017

Done, thanks

@jbgi jbgi deleted the kodi-dvdfix branch April 22, 2017 14:09
@samueldr samueldr removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants