Q&D patch for the multilib fix on N41/F41 #4733
Draft
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
Signed-off-by: Peter Kovář <peter.kovar@reflexion.tv>
lgritz
reviewed
May 1, 2025
| @@ -17,7 +17,7 @@ | |||
| include (FindPackageHandleStandardArgs) | |||
|
|
|||
| find_path (LIBHEIF_INCLUDE_DIR | |||
| libheif/heif_version.h | |||
| libheif/heif_version-64.h | |||
There was a problem hiding this comment.
Suggested change
| libheif/heif_version-64.h | |
| NAMES libheif/heif_version.h libheif/heif_version-64.h |
According to cmake docs, you can give several names to try.
| @@ -30,7 +30,7 @@ find_library (LIBHEIF_LIBRARY heif | |||
| DOC "The directory where libheif libraries reside") | |||
|
|
|||
| if (LIBHEIF_INCLUDE_DIR) | |||
| file(STRINGS "${LIBHEIF_INCLUDE_DIR}/libheif/heif_version.h" TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$") | |||
| file(STRINGS "${LIBHEIF_INCLUDE_DIR}/libheif/heif_version-64.h" TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$") | |||
There was a problem hiding this comment.
I think you'll want something like
if (EXISTS name_choice_1)
set (heif_header name_choice_1)
else if (EXISTS name_choice_2)
set (heif_header name_choice_2)
endif ()
file(STRINGS ${heif_header_name} TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$")
|
Ping on this, @1div0 |
|
@1div0 Re-ping |
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.
Description
This PR is intended to avoid the HEIF library version detection failure on the latest Nobara 41 and Fedora 41 as well as 42 distributions.
There must be a better distribution neutral way, so marking as draft.
Fixes #4732