Skip to content

obs-wlrobs: 20191008 -> 20200111 #77565

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.

Sign up for GitHub

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
Merged
merged 1 commit into from
Jan 25, 2020
Merged

obs-wlrobs: 20191008 -> 20200111 #77565

merged 1 commit into from
Jan 25, 2020
+14 −9

Conversation

NilsIrl
Copy link
Member

@NilsIrl NilsIrl commented Jan 12, 2020

Motivation for this change

Update

Things done
  • 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.

cc @grahamc

Sorry, something went wrong.

@ofborg ofborg bot requested a review from grahamc January 12, 2020 16:00
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 12, 2020
grahamc
grahamc reviewed Jan 25, 2020
View reviewed changes
pkgs/applications/video/obs-studio/wlrobs.nix

installPhase = ''
mkdir -p $out/share/obs/obs-plugins/wlrobs/bin/64bit
cp ./libwlrobs.so $out/share/obs/obs-plugins/wlrobs/bin/64bit/
'';

mesonFlags = [
"-Duse_dmabuf=${if dmabufSupport then "true" else "false"}"
Copy link
Member

Choose a reason for hiding this comment

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

What does this do, and why do we default it to off?

Copy link
Member Author

@NilsIrl NilsIrl Jan 25, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

It's a new back-end (that is supposed to have better performance). It doesn't support all the features (such as resizing and moving on obs) and it isn't enabled by default by meson so I disabled it.

@NilsIrl
Copy link
Member Author

NilsIrl commented Jan 25, 2020 •
edited
Loading

X11 had to be set as a dependency otherwise meson gives the following error:

Run-time dependency libobs found: NO

meson.build:5:0: ERROR: Could not generate cargs for libobs:
Package x11 was not found in the pkg-config search path.
Perhaps you should add the directory containing `x11.pc'
to the PKG_CONFIG_PATH environment variable
Package 'x11', required by 'libobs', not found

There's probably a better way of doing it (that I don't know of).

@grahamc
Copy link
Member

grahamc commented Jan 25, 2020

Thank you for the ping!

@grahamc grahamc merged commit ab94e9a into NixOS:master Jan 25, 2020
@NilsIrl NilsIrl deleted the wlrobs_2020 branch January 25, 2020 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@NilsIrl @grahamc