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

Disable JPEG finding in libyuv #2459

Merged
merged 1 commit into from
Oct 2, 2024
Merged

Conversation

vrabaud
Copy link
Collaborator

@vrabaud vrabaud commented Oct 2, 2024

This is to prevent extra files in libyuv to be built and have a dependency order problem.

@vrabaud vrabaud changed the title Disable JPEG_LIBRARY before including libyuv. Disable JPEG finding in libyuv Oct 2, 2024
This is to prevent extra files in libyuv to be built and
have a dependency order problem.
@vrabaud vrabaud requested a review from maryla-uc October 2, 2024 08:48
@vrabaud vrabaud marked this pull request as ready for review October 2, 2024 08:48
Copy link
Collaborator

@maryla-uc maryla-uc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!!

@vrabaud
Copy link
Collaborator Author

vrabaud commented Oct 2, 2024

The windows CI problem is unrelated.

@vrabaud vrabaud merged commit fd66e9d into AOMediaCodec:main Oct 2, 2024
33 of 34 checks passed
@vrabaud vrabaud deleted the cmake_libyuv branch October 2, 2024 09:10
@@ -34,6 +34,7 @@ else()
GIT_REPOSITORY "https://chromium.googlesource.com/libyuv/libyuv"
BINARY_DIR "${LIBYUV_BINARY_DIR}"
GIT_TAG "${AVIF_LOCAL_LIBYUV_TAG}"
PATCH_COMMAND sed -i.bak -e "s:find_package.*(.*JPEG.*)::" CMakeLists.txt
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vincent: Are you planning to submit a patch to libyuv to handle this properly?

Looking at the other build systems in the libyuv source tree, I think we should add a LIBYUV_DISABLE_JPEG option to libyuv's CMakeLists.txt file.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need actually, I reverted that patch: there is actually an official way to make find_package fail, cf #2473

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.

3 participants