-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
[sdl2] Make dbus dependency optional. #40633
Conversation
dc5a623
to
002e211
Compare
@microsoft-github-policy-service agree |
@FrankXie05 Not sure what's up with the failed Windows builds given that they have nothing to do with dbus. |
cb32d09
to
aadcf7a
Compare
@FrankXie05 That did the trick, thanks! |
The choice of the |
@dg0yt Could you explain how, I'm not sure I follow. |
ATM this PR just make it optional to have the dbus port installed by vcpkg before the sdl2 port.
sdl2 must not use dbus. (Similar for system-provided dbus.) If there is a CMake option to control this goal, you can use that option. If there is |
Doesn't the same apply to x11, Wayland etc. If you happen to not have the system headers installed they are silently disabled even if requested? |
@dg0yt https://github.com/libsdl-org/SDL/blob/SDL2/CMakeLists.txt#L1593-L1601
using: FROM debian:unstable
RUN apt-get update && apt-get -qq install --no-install-recommends build-essential git cmake ninja-build autoconf libtool python3 python3-jinja2 curl zip unzip tar ca-certificates libltdl-dev pkg-config
RUN <<EOF cat >> vcpkg.json
{
"\$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "ezquake",
"version": "1.0.0",
"dependencies": [
{ "name": "dbus", "default-features": false },
{ "name": "sdl2", "default-features": false }
]
}
EOF
#RUN git clone https://github.com/microsoft/vcpkg
RUN git clone https://github.com/dsvensson/vcpkg && (cd vcpkg; git reset --hard origin/patch-1)
RUN VCPKG_DISABLE_METRICS=1 vcpkg/bootstrap-vcpkg.sh && vcpkg/vcpkg install ....and removing the dbus line and passing |
@FrankXie05 @dg0yt Anything else that stands out? |
@dg0yt Could this be the final version? Or there's more CI torture left 😂 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM but somebody else must approve.
Thanks @dsvensson.
@FrankXie05 what do you think, ready? |
@dsvensson Thanks for this PR, and @dg0yt thanks for review. :) |
@FrankXie05 Now that it's marked as reviewed, approved etc, what phases are left until it's merged? Just trying to get an understanding of the PR workflow in this project as I have some other ports that I carry some changes for so just want to align my expectations. |
@dsvensson after PR has been marked |
Instead of having dbus as a mandatory dependency, make it optional, but enabled by the default features to keep behavior for people who just depend on sdl2 without disabling default features. Trims about 85% off the build time if disabled.
Fixes #40632