cantata: make qtmultimedia and vlc optional #83799
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
Upstream defaults vlc to off. Its only purpose is as an alternative to QtMultimedia for "MPD HTTP stream playback" [1]. Similarly, provide a toggle for qtmultimedia, in case somebody wants to disable HTTP stream playback. [1] https://github.com/CDrummond/cantata/blob/efa907c8e03d052718f14834eb968da86d1c34d8/CMakeLists.txt#L51
|
@GrahamcOfBorg eval |
|
Ping @peterhoeg. Got a second to review this? |
|
Looks good, 👍 from here. |
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.
Upstream defaults vlc to off. Its only purpose is as an alternative to
QtMultimedia for "MPD HTTP stream playback" [1]. Similarly, provide a
toggle for qtmultimedia, in case somebody wants to disable HTTP stream
playback.
[1] https://github.com/CDrummond/cantata/blob/efa907c8e03d052718f14834eb968da86d1c34d8/CMakeLists.txt#L51
Motivation for this change
vlcwas declared as a dependency, but was never actually linked to cantata. Now, if the user so chooses, it can be used for HTTP stream playback.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)Would be nice to get somebody on NixOS to test the binary and make sure I didn't muck anything up. Inspecting the binary with
lddshows it linked toQtMultimediaby default, not linked to it whenwithHttpStream = false, as well as not linked tovlcby default, and linked whenwithLibVlc = true.