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

Jump to bottom

vlc: add skin support #109235

Merged
merged 3 commits into from Jan 17, 2021
Merged

vlc: add skin support #109235

merged 3 commits into from Jan 17, 2021

Conversation

lucasew
Copy link
Contributor

@lucasew lucasew commented Jan 12, 2021

Motivation for this change

Lack of support to skins in the NixOS VLC compilation

Things done

Add this support as an option in the package

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

thiagokokada
thiagokokada reviewed Jan 13, 2021
View reviewed changes
pkgs/applications/video/vlc/default.nix Outdated Show resolved Hide resolved
pkgs/applications/video/vlc/default.nix Outdated Show resolved Hide resolved
pkgs/applications/video/vlc/default.nix Outdated Show resolved Hide resolved
@thiagokokada
Copy link
Contributor

Also, please squash your commits.

@ofborg ofborg bot removed the 6.topic: python label Jan 14, 2021
@lucasew
Copy link
Contributor Author

lucasew commented Jan 14, 2021

IDK why this is happening but when I force push my squashed commits it pushes the commit before it too.

The hash changes because the commit before change too. Probably for the merge it will be necessary to cherry-pick the commit to master.

@jonringer
Copy link
Contributor

IDK why this is happening but when I force push my squashed commits it pushes the commit before it too.

if you're doing git rebase -i, you're probably specifying a range which includes the commit before yours. You can do git branch --set-upstream-to=origin/master to enable just doing git rebase -i and git will be able to determine your specific commits

git rebase -i is a powerful command which achieves this, I created a small video demonstrating it's use here. A more indepth text tutorial can be found here

SuperSandro2000
SuperSandro2000 reviewed Jan 14, 2021
View reviewed changes
pkgs/applications/video/vlc/default.nix Outdated Show resolved Hide resolved
pkgs/applications/video/vlc/default.nix Outdated Show resolved Hide resolved
pkgs/applications/video/vlc/default.nix Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 109235 run on x86_64-linux 1

2 packages marked as broken and skipped:
  • libsForQt512.elisa
  • libsForQt514.elisa
21 packages failed to build and are new build failures:
  • libsForQt5.elisa: log was empty
  • (kdeApplications.elisa: log was empty
  • ,libsForQt515.elisa): log was empty
  • libsForQt5.phonon-backend-vlc: log was empty
  • (libsForQt515.phonon-backend-vlc): log was empty
  • libsForQt512.phonon-backend-vlc: log was empty
  • libsForQt514.phonon-backend-vlc: log was empty
  • libvlc: log https://termbin.com/pzpz
  • megaglest: log was empty
  • minitube: log was empty
  • obs-move-transition: log was empty
  • obs-ndi: log was empty
  • obs-studio: log was empty
  • obs-v4l2sink: log was empty
  • obs-wlrobs: log was empty
  • pympress: log was empty
  • python37Packages.python-vlc: log was empty
  • python38Packages.python-vlc: log was empty
  • python39Packages.python-vlc: log was empty
  • strawberry: log was empty
  • tribler: log was empty
1 package built:
  • vlc (vlc_qt5)

@SuperSandro2000
Copy link
Member

Please fix the libvlc build failure.

@lucasew
trying to undo the mess
8c9320b 
Signed-off-by: GitHub <noreply@github.com>
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 109235 run on x86_64-linux 1

2 packages marked as broken and skipped:
  • libsForQt512.elisa
  • libsForQt514.elisa
21 packages failed to build and are new build failures:
  • libsForQt5.elisa: log was empty
  • (kdeApplications.elisa: log was empty
  • ,libsForQt515.elisa): log was empty
  • libsForQt5.phonon-backend-vlc: log was empty
  • (libsForQt515.phonon-backend-vlc): log was empty
  • libsForQt512.phonon-backend-vlc: log was empty
  • libsForQt514.phonon-backend-vlc: log was empty
  • libvlc: log https://termbin.com/1nnw
  • megaglest: log was empty
  • minitube: log was empty
  • obs-move-transition: log was empty
  • obs-ndi: log was empty
  • obs-studio: log was empty
  • obs-v4l2sink: log was empty
  • obs-wlrobs: log was empty
  • pympress: log was empty
  • python37Packages.python-vlc: log was empty
  • python38Packages.python-vlc: log was empty
  • python39Packages.python-vlc: log was empty
  • strawberry: log was empty
  • tribler: log was empty
1 package built:
  • vlc (vlc_qt5)

@SuperSandro2000
Copy link
Member

Your last commit does not fix libvlc which I expected because currently it does nothing at all.

@lucasew
skins2Support enabled by default only if not libvlc
82962b7 
Signed-off-by: GitHub <noreply@github.com>
@lucasew
Copy link
Contributor Author

lucasew commented Jan 17, 2021

I think now libvlc is fine xD

When you asked to fix I didn't understand how to fix the problem then, before sleep, I realized that the problem is skins2 enabled in libvlc, that doesn't make sense, then I set skins2 default parameter to false if libvlc is being built.

This is the first PR that I sent that I was scared because I broke something and I didn't know how to fix it but this kind of problem usually has the solution right before sleep xD. It was an honor question, I must find this solution.

This is one of the things that makes programming awesome.

SuperSandro2000
SuperSandro2000 approved these changes Jan 17, 2021
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jan 17, 2021 •
edited

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 109235 run on x86_64-linux 1

1 package built:
  • vlc (vlc_qt5)

The following issues got detected with the above build packages.
Please fix at least the ones listed with your changed packages:

vlc:

Please consider this feature to be alpha:

A substituteInPlace with an unused --replace got detected:

substituteStream(): WARNING: pattern '/bin/echo' doesn't match anything in file 'configure'

Please check the offending substituteInPlace for typos or changes in source.

@SuperSandro2000 SuperSandro2000 merged commit d3c32e6 into NixOS:master Jan 17, 2021
@lucasew lucasew deleted the patch-1 branch January 17, 2021 19:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thiagokokada thiagokokada thiagokokada left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@mmahut mmahut Awaiting requested review from mmahut

@RaghavSood RaghavSood Awaiting requested review from RaghavSood

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lucasew @thiagokokada @jonringer @SuperSandro2000