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

[WPE][GTK] Introduce WPE 2.0 API version, and ENABLE_2022_GLIB_API flag to indicate either GTK 4 or WPE 2.0 #3886

Conversation

mcatanzaro
Copy link
Contributor

@mcatanzaro mcatanzaro commented Aug 31, 2022

b2a6414

[WPE][GTK] Introduce WPE 2.0 API version, and ENABLE_2022_GLIB_API flag to indicate either GTK 4 or WPE 2.0
https://bugs.webkit.org/show_bug.cgi?id=244641

Reviewed by Adrian Perez de Castro.

Since there are few users of the WPE 1.1 API, and we don't need to keep
it around, WPE 2.0 will simply replace WPE 1.1. In contrast, the WPE 1.0
API is still required until Igalia is ready to phase out libsoup 2.

With a new API version, I will be able to start breaking things in
subsequent commits.

I've also fixed some misleading code in OptionsWPE.cmake where option
dependencies were located under an unrelated comment, intermixed with
option definitions.

* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:

Canonical link: https://commits.webkit.org/254653@main

898bec6

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios   πŸ›  mac βœ… πŸ›  wpe
βœ… πŸ›  ios-sim   πŸ›  mac-debug   πŸ›  gtk βœ… πŸ›  wincairo
βœ… πŸ§ͺ webkitperl   πŸ§ͺ ios-wk2 βœ… πŸ›  mac-AS-debug   πŸ§ͺ gtk-wk2
  πŸ§ͺ api-ios   πŸ§ͺ api-mac   πŸ§ͺ api-gtk
βœ… πŸ›  πŸ§ͺ jsc βœ… πŸ›  tv   πŸ§ͺ mac-wk1 βœ… πŸ›  jsc-armv7
βœ… πŸ›  tv-sim   πŸ§ͺ mac-wk2 βœ… πŸ§ͺ jsc-armv7-tests
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch   πŸ§ͺ mac-AS-debug-wk2 βœ… πŸ›  jsc-mips
βœ… πŸ›  watch-sim   πŸ§ͺ mac-wk2-stress βœ… πŸ§ͺ jsc-mips-tests

@mcatanzaro mcatanzaro requested a review from a team as a code owner August 31, 2022 23:53
@mcatanzaro mcatanzaro self-assigned this Aug 31, 2022
Copy link
Contributor

@carlosgcampos carlosgcampos left a comment

Choose a reason for hiding this comment

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

I'm not sure I understand the library version bumps, so I think this patch should just add the new api version for wpe. We can add the new api ifdef in a follow up when actually needed and used.

Source/cmake/OptionsGTK.cmake Outdated Show resolved Hide resolved
Source/cmake/OptionsWPE.cmake Show resolved Hide resolved
Source/cmake/OptionsWPE.cmake Outdated Show resolved Hide resolved
Source/cmake/OptionsWPE.cmake Outdated Show resolved Hide resolved
@mcatanzaro mcatanzaro marked this pull request as draft September 7, 2022 16:02
@mcatanzaro mcatanzaro force-pushed the eng/WPEGTK-Introduce-WPE-2-0-API-version-and-ENABLE_2022_GLIB_API-flag-to-indicate-either-GTK-4-or-WPE-2-0 branch from 4bfbc80 to c632de1 Compare September 7, 2022 16:04
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 7, 2022
@mcatanzaro mcatanzaro marked this pull request as ready for review September 8, 2022 14:53
@mcatanzaro mcatanzaro removed the merging-blocked Applied to prevent a change from being merged label Sep 9, 2022
@mcatanzaro mcatanzaro force-pushed the eng/WPEGTK-Introduce-WPE-2-0-API-version-and-ENABLE_2022_GLIB_API-flag-to-indicate-either-GTK-4-or-WPE-2-0 branch 3 times, most recently from c03d3ee to a579de6 Compare September 9, 2022 14:35
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 9, 2022
@webkit-early-warning-system
Copy link
Collaborator

Starting EWS tests for c03d3ee. Live statuses available at the PR page, #3886

@webkit-early-warning-system
Copy link
Collaborator

Starting EWS tests for a901af0. Live statuses available at the PR page, #3886

@mcatanzaro mcatanzaro added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged merge-queue Applied to send a pull request to merge-queue labels Sep 13, 2022
@mcatanzaro mcatanzaro force-pushed the eng/WPEGTK-Introduce-WPE-2-0-API-version-and-ENABLE_2022_GLIB_API-flag-to-indicate-either-GTK-4-or-WPE-2-0 branch from a579de6 to 898bec6 Compare September 19, 2022 21:23
@mcatanzaro mcatanzaro added the merge-queue Applied to send a pull request to merge-queue label Sep 19, 2022
…ag to indicate either GTK 4 or WPE 2.0

https://bugs.webkit.org/show_bug.cgi?id=244641

Reviewed by Adrian Perez de Castro.

Since there are few users of the WPE 1.1 API, and we don't need to keep
it around, WPE 2.0 will simply replace WPE 1.1. In contrast, the WPE 1.0
API is still required until Igalia is ready to phase out libsoup 2.

With a new API version, I will be able to start breaking things in
subsequent commits.

I've also fixed some misleading code in OptionsWPE.cmake where option
dependencies were located under an unrelated comment, intermixed with
option definitions.

* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:

Canonical link: https://commits.webkit.org/254653@main
@webkit-early-warning-system webkit-early-warning-system force-pushed the eng/WPEGTK-Introduce-WPE-2-0-API-version-and-ENABLE_2022_GLIB_API-flag-to-indicate-either-GTK-4-or-WPE-2-0 branch from 898bec6 to b2a6414 Compare September 20, 2022 00:45
@webkit-commit-queue
Copy link
Collaborator

Committed 254653@main (b2a6414): https://commits.webkit.org/254653@main

Reviewed commits have been landed. Closing PR #3886 and removing active labels.

@webkit-early-warning-system webkit-early-warning-system merged commit b2a6414 into WebKit:main Sep 20, 2022
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Sep 20, 2022
lauromoura added a commit to lauromoura/cog that referenced this pull request Sep 21, 2022
aperezdc pushed a commit to Igalia/cog that referenced this pull request Sep 22, 2022
@mcatanzaro mcatanzaro deleted the eng/WPEGTK-Introduce-WPE-2-0-API-version-and-ENABLE_2022_GLIB_API-flag-to-indicate-either-GTK-4-or-WPE-2-0 branch December 22, 2022 23:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WPE WebKit WebKit WPE component
Projects
None yet
6 participants