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.

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

Freebsd compat #2544

Merged
merged 2 commits into from
May 27, 2017
Merged

Freebsd compat #2544

merged 2 commits into from
May 27, 2017

Commits on May 26, 2017

  1. Fix compilation on FreeBSD with 2 openjpegs 

    When openjpeg 1.5 is installed (Calligra 2.x, for example) and OpenJPEG
2.1 is installed, the subdirectory is added twice.

Since the 2nd time is ignored, it is ranked after the more general
/usr/local/include and openjpeg.h from the 1.5 version is picked up.

Fix this in a more general way:
- If a directory is added that already is in path
- But where is specified

Then remove the subdir from path and insert it at the spot requested.

A FIXME is added to the code bit explaining the real issue, but lack
investigative spirit / time to dive down the rabbit hole.
    @melvyn-sopacua
    melvyn-sopacua committed May 26, 2017
    Configuration menu
    Copy the full SHA
    092d97f View commit details
    Browse the repository at this point in the history

  2. Add the FIXME and remove debug code

    @melvyn-sopacua
    melvyn-sopacua committed May 26, 2017
    Configuration menu
    Copy the full SHA
    5d7480a View commit details
    Browse the repository at this point in the history