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

dev-qt/qtwayland: make compositor APIs off-by-default optional #271

Merged
merged 2 commits into from
Oct 8, 2023

Conversation

a17r
Copy link
Member

@a17r a17r commented Oct 7, 2023

Would have preferred a clean split but wayland-server depends on wayland-client in the buildsys.

  • Drop IUSE vulkan: Merge with 'compositor' instead. This absolves us from having to make a default conflicting REQUIRED_USE with compositor.
  • Drop IUSE X: Unused, broken upstream since 2021 and removed in Qt6. Quoting upstream from commit d4a7faff: "These plugins were created to allow testing/debugging of QtWayland- based compositors on desktops that did not support Wayland natively."

PS: Not runtime tested yet.

@a17r a17r requested review from Pesa, ionenwks and Chiitoo October 7, 2023 20:48
Copy link
Contributor

@Chiitoo Chiitoo left a comment

Choose a reason for hiding this comment

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

Did not get to testing yet either, but no objections from me after just a look-see.

Thank you!

Copy link
Contributor

@Pesa Pesa left a comment

Choose a reason for hiding this comment

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

No objections.

@a17r
Copy link
Member Author

a17r commented Oct 7, 2023

Of course, the decision to drop IUSE=vulkan leads to the following issues:

FAILURES
dev-qt/qtwayland
  NonsolvableDepsInStable: version 5.15.11: nonsolvable depset(depend) keyword(~arm) stable profile (default/linux/arm/17.0) (70 total): solutions: [ =dev-qt/qtgui-5.15.11*:5=[vulkan] ]
  NonsolvableDepsInStable: version 5.15.11: nonsolvable depset(depend) keyword(~hppa) stable profile (default/linux/hppa/17.0) (20 total): solutions: [ =dev-qt/qtgui-5.15.11*:5=[vulkan], dev-util/vulkan-headers ]
  NonsolvableDepsInStable: version 5.15.11: nonsolvable depset(rdepend) keyword(~arm) stable profile (default/linux/arm/17.0) (90 total): solutions: [ =dev-qt/qtgui-5.15.11*:5=[vulkan] ]

Maybe just mask qtwayland:5[compositor] on these arches in addition to vulkan.

Would have preferred a clean split but wayland-server depends on
wayland-client in the buildsys.

- Drop IUSE vulkan: Merge with 'compositor' instead. This absolves us from
    having to make a default conflicting REQUIRED_USE with compositor.
- Drop IUSE X: Unused, broken upstream since 2021 and removed in Qt6.
    Quoting upstream from commit d4a7faff:
    "These plugins were created to allow testing/debugging of QtWayland-
    based compositors on desktops that did not support Wayland natively."

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
@a17r a17r force-pushed the qtwayland-iuse-compositor branch from c8a3ffb to caf38f7 Compare October 8, 2023 12:03
@a17r
Copy link
Member Author

a17r commented Oct 8, 2023

Yup, down to this after cleaning up obsolete package.use.mask entries in ::gentoo:

dev-qt/qtwayland
  MissingRemoteId: missing <remote-id type="kde-invent">qt/qt</remote-id> (inferred from URI 'https://invent.kde.org/qt/qt/')
  NonsolvableDepsInStable: version 5.15.11: nonsolvable depset(depend) keyword(~hppa) stable profile (default/linux/hppa/17.0) (20 total): solutions: [ =dev-qt/qtgui-5.15.11*:5=[vulkan], dev-util/vulkan-headers ]
  NonsolvableDepsInStable: version 5.15.11: nonsolvable depset(rdepend) keyword(~hppa) stable profile (default/linux/hppa/17.0) (20 total): solutions: [ =dev-qt/qtgui-5.15.11*:5=[vulkan] ]

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
@gentoo-bot gentoo-bot merged commit ad15f67 into gentoo:master Oct 8, 2023
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.

4 participants