Skip to content

Build improvements.#2712

Merged
bradleysepos merged 2 commits intoHandBrake:masterfrom
bradleysepos:build-improvements
Mar 30, 2020
Merged

Build improvements.#2712
bradleysepos merged 2 commits intoHandBrake:masterfrom
bradleysepos:build-improvements

Conversation

@bradleysepos
Copy link
Copy Markdown
Contributor

@bradleysepos bradleysepos commented Mar 25, 2020

Improves library detection for system packages and allows custom pkg-config files paths. On Linux, uses pkg-config to locate libxml2 for libhb if possible, falling back to the previous hardcoded path. FFmpeg looks for libxml2 in the same manner.

While I initially worked on these improvements due to #2690 (and this PR does fix building on NixOS), the solutions are more generic in nature and should make the build system a bit more robust in these areas.

Test on:

  • Windows 10+ (via MinGW)
  • macOS 10.13+
  • Ubuntu Linux

@doronbehar
Copy link
Copy Markdown

I can confirm this fixes #2690 for me.

@sr55
Copy link
Copy Markdown
Contributor

sr55 commented Mar 29, 2020

LGTM

Allows specifying custom locations for pkg-config files, and makes the build system generally compatible with packaging systems such as Nix.
The previous hardcoded path is now the fallback.
@bradleysepos bradleysepos merged commit ed8b3a3 into HandBrake:master Mar 30, 2020
@bradleysepos bradleysepos deleted the build-improvements branch March 30, 2020 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

5 participants