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

Set conditional HTTP depending on EXIV2_ENABLE_WEBREADY (backport #2844) #2975

Merged
merged 1 commit into from
May 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2024

HTTP support is being enabled regardless of the fact EXIV2_ENABLE_WEBREADY is configured or not.
This PR makes sure http is not included/built if EXIV2_ENABLE_WEBREADY specifically disabled.

This is an alternative to #2843
PoC: xbmc/xbmc#24109


This is an automatic backport of pull request #2844 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label May 17, 2024
Copy link
Contributor Author

mergify bot commented May 17, 2024

Cherry-pick of 9f90144 has failed:

On branch mergify/bp/0.28.x/pr-2844
Your branch is up to date with 'origin/0.28.x'.

You are currently cherry-picking commit 9f90144e8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   include/exiv2/exiv2.hpp
	modified:   include/meson.build
	modified:   meson.build
	modified:   meson_options.txt
	modified:   src/basicio.cpp
	modified:   src/image.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/CMakeLists.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-2844 branch from d337c81 to 88847dc Compare May 17, 2024 08:38
@kmilos kmilos removed the conflicts label May 17, 2024
@kmilos kmilos added this to the v0.28.3 milestone May 17, 2024
@kmilos kmilos merged commit 7603d33 into 0.28.x May 17, 2024
60 of 61 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-2844 branch May 17, 2024 08:51
@kmilos kmilos added the CMake Configuration issues related with CMake label May 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake Configuration issues related with CMake
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants