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

opencv3: pull patches only if necessary #21116

Merged
merged 1 commit into from Dec 13, 2016
Merged

opencv3: pull patches only if necessary #21116

merged 1 commit into from Dec 13, 2016

Conversation

mdaiter
Copy link
Contributor

@mdaiter mdaiter commented Dec 13, 2016

Motivation for this change

Only pull patches for fixing specific functionalities in OpenCV 3 iff

  1. The end user requires it in order for the functionality requested to work properly
  2. The source code MUST be amended to work as intended

This also implies a specific context for each patch applied; for example, the CUDA patches are wrapped in a lib.optionals enableCUDA if-block, which tells the reader that the patches are meant for CUDA.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@mdaiter, thanks for your PR! By analyzing the history of the files in this pull request, we identified @abbradar, @cpages and @bjornfor to be potential reviewers.

@viric viric merged commit b1c20ad into NixOS:master Dec 13, 2016
@mdaiter mdaiter deleted the cudaOpenCVIf branch December 13, 2016 14:21
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

3 participants