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

x11vnc: 0.9.13 -> 0.9.15, adding maintainer #48613

Merged
merged 4 commits into from Oct 17, 2018

Conversation

OPNA2608
Copy link
Contributor

Motivation for this change

redoing this PR as I broke the last one by accident (#48459).

See my issue/request #48263.
tl;dr 0.9.13 is the last release before official development seized from what I can tell. 0.9.15 is a newer community release of x11vnc.

I'd also adopt this package, as it's currently lacking a maintainer and I'm frequently using this application.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

updated x11vnc to use the GitHub repo and up-to-date version 0.9.15
adding myself as maintainer
patching the currently broken Xdummy script out of the Makefile.am, else it gets put into bin.
this is not a regression of functionality, as it doesn't appear to be put into bin in the upstream version either.
@OPNA2608
Copy link
Contributor Author

OPNA2608 commented Oct 17, 2018

@markuskowa

If you can't make it work, just open a new PR and ping me.

I added one more commit to exclude the currently nonfunctional script Xdummy from the build process that would otherwise get put into bin. I think this should be okay for now, since its absence in the current upstream version means there's no regression of functionality by doing this.
I'd see if I can figure out a fix if there's demand for it (never needed the affected switch -xdummy before), however it might take awhile.

@markuskowa markuskowa mentioned this pull request Oct 17, 2018
9 tasks
@markuskowa
Copy link
Member

Do you know what the problem with Xdummy is?

moved substitutions to postPatch phase and commented on workaround sed line, as requested in the code reviews
@OPNA2608
Copy link
Contributor Author

When invoked with the -xdummy switch, x11vnc calls the supplied Xdummy script, which will compile the C code at the end of that same script file into a library.
It appears x11vnc will then use this library to intercept system calls via LD_PRELOAD to make stuff work better with the dummy device driver.
Here's the help text from the script, which explains the gist of it much better.

For this, it needs a working C compiling environment during runtime, with gcc and all. I have yet to figure out how to get that working. Any tips?

@markuskowa
Copy link
Member

Thanks, I understand now. One would need to build that piece of C-code (by extracting it from the script) from within the derivation, install it, and then patch Xdummy such that it calls the binary in the right way with the LD_PRELOAD. I'm not sure what side effects there need to be taken into account. That certainly requires requires a full patch.
Xdummy did not exist in the old version?

@OPNA2608
Copy link
Contributor Author

At least not in $out/bin.
It's definitely part of the 0.9.13 source files that get downloaded for the build process, but the only file that ends up in $out/bin is the main x11vnc executable and using the -xdummy switch and connecting to the session will throw an error because it can't find Xdummy in the PATH before continuing as if -xdummy was never supplied.

The same behaviour, missing Xdummy script and all, can be observed in Ubuntu 16.04 LTS and 18.04 LTS by the way (0.9.13).

@markuskowa
Copy link
Member

OK, that sounds like more work to fix.

@markuskowa
Copy link
Member

@GrahamcOfBorg build x11vnc

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: x11vnc

Partial log (click to expand)

make[1]: Leaving directory '/build/source'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/6wxnfs4jzqldfd7zwh402d9r3c3956kd-x11vnc-0.9.15
shrinking /nix/store/6wxnfs4jzqldfd7zwh402d9r3c3956kd-x11vnc-0.9.15/bin/x11vnc
gzipping man pages under /nix/store/6wxnfs4jzqldfd7zwh402d9r3c3956kd-x11vnc-0.9.15/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/6wxnfs4jzqldfd7zwh402d9r3c3956kd-x11vnc-0.9.15/bin
patching script interpreter paths in /nix/store/6wxnfs4jzqldfd7zwh402d9r3c3956kd-x11vnc-0.9.15
checking for references to /build in /nix/store/6wxnfs4jzqldfd7zwh402d9r3c3956kd-x11vnc-0.9.15...
/nix/store/6wxnfs4jzqldfd7zwh402d9r3c3956kd-x11vnc-0.9.15

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: x11vnc

Partial log (click to expand)

make[1]: Leaving directory '/build/source'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/fs54pnl8wn7zvyajyg8j5y5rj7aj236h-x11vnc-0.9.15
shrinking /nix/store/fs54pnl8wn7zvyajyg8j5y5rj7aj236h-x11vnc-0.9.15/bin/x11vnc
gzipping man pages under /nix/store/fs54pnl8wn7zvyajyg8j5y5rj7aj236h-x11vnc-0.9.15/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fs54pnl8wn7zvyajyg8j5y5rj7aj236h-x11vnc-0.9.15/bin
patching script interpreter paths in /nix/store/fs54pnl8wn7zvyajyg8j5y5rj7aj236h-x11vnc-0.9.15
checking for references to /build in /nix/store/fs54pnl8wn7zvyajyg8j5y5rj7aj236h-x11vnc-0.9.15...
/nix/store/fs54pnl8wn7zvyajyg8j5y5rj7aj236h-x11vnc-0.9.15

@markuskowa markuskowa merged commit a845552 into NixOS:master Oct 17, 2018
@OPNA2608 OPNA2608 deleted the x11vnc-update branch October 18, 2018 10:10
@OPNA2608 OPNA2608 restored the x11vnc-update branch October 18, 2018 10:16
@OPNA2608 OPNA2608 deleted the x11vnc-update branch October 18, 2018 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants