jxrlib: switch to maintained fork, ship pkgconfig. freeimage: unbundle libraries, fix ftbfs#61191
Open
JkktBkkt wants to merge 2 commits into
Open
jxrlib: switch to maintained fork, ship pkgconfig. freeimage: unbundle libraries, fix ftbfs#61191JkktBkkt wants to merge 2 commits into
JkktBkkt wants to merge 2 commits into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On master, both of these packages fail to build.
Testing the changes
I tested the changes in this PR: briefly — successfully built reverse dependencies of both of these packages with enabled testsuites (where available) on: x86_64, x86_64-musl, i686 and cross
Local build testing
Notes
These changes are based on arch and fedora packages, had to edit in the pkgconfig for jxrlib (so it can be found in cross builds).
Proper cmake support for jxrlib is planned by the maintainer of this fork, but hasn't been pushed yet, so this PR uses a third-party written CMakeLists.txt still.
I tried using cmake build style for freeimage from this fork but it appears that freeimageplus wrapper is not being built in that case, and is not maintained.