Skip to content

highgui Wayland xdg_shell#22102

Merged
opencv-pushbot merged 1 commit intoopencv:4.xfrom
jwinarske:jw/xdg_shell
Jul 4, 2022
Merged

highgui Wayland xdg_shell#22102
opencv-pushbot merged 1 commit intoopencv:4.xfrom
jwinarske:jw/xdg_shell

Conversation

@jwinarske
Copy link
Copy Markdown
Contributor

@jwinarske jwinarske commented Jun 14, 2022

-enable using -DWITH_WAYLAND=ON
-adapted from https://github.com/pfpacket/opencv-wayland
-using stable protocol
-overrides HAVE_QT if HAVE_WAYLAND and WITH_WAYLAND are set

Signed-off-by: Joel Winarske joel.winarske@gmail.com

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@pfpacket

alalek
alalek reviewed Jun 16, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek 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 for great contribution!

Please take a look on comments below.

@jwinarske
Copy link
Copy Markdown
Contributor Author

jwinarske commented Jun 17, 2022

Something this PR doesn't handle is buffer scaling. This is when you have multiple displays, and you set one display with a different scaling factor than another. I will add that in subsequent PR.

Another thing to be validate/added is SW rendering support (llvmpipe). For GPU-less CI runs.

@jwinarske jwinarske force-pushed the jw/xdg_shell branch 5 times, most recently from c18abee to 7f8bd2c Compare June 17, 2022 21:31
@jwinarske
Copy link
Copy Markdown
Contributor Author

jwinarske commented Jun 17, 2022

@alalek Changes are now ready for review. I had missed a couple.

@jwinarske
Copy link
Copy Markdown
Contributor Author

jwinarske commented Jun 21, 2022

@alalek ping

alalek
alalek reviewed Jun 21, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek 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 for update! Overall look good.

Please take a look on minor comments below.

@jwinarske jwinarske force-pushed the jw/xdg_shell branch 4 times, most recently from 61e8682 to 58b7ee7 Compare June 22, 2022 20:23
@jwinarske jwinarske mentioned this pull request Jun 23, 2022
Closed
alalek
alalek approved these changes Jun 23, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

LGTM 👍

fooishbar
fooishbar reviewed Jun 24, 2022
View reviewed changes
fooishbar
fooishbar reviewed Jun 24, 2022
View reviewed changes
fooishbar
fooishbar reviewed Jun 24, 2022
View reviewed changes
fooishbar
fooishbar reviewed Jun 24, 2022
View reviewed changes
@fooishbar
Copy link
Copy Markdown

fooishbar commented Jun 24, 2022

A few comments but generally looks like the right thing (noting that I'm not at all familiar with OpenCV internals), thanks Joel!

@jwinarske
Copy link
Copy Markdown
Contributor Author

jwinarske commented Jun 24, 2022

@alalek I just noticed GLX pulling in X11 deps. I am planning to factor this out for a Wayland only build. It will be a few days before I get this and the last items above done.

@jwinarske
Copy link
Copy Markdown
Contributor Author

jwinarske commented Jun 25, 2022

@alalek OpenGL (egl/GLESv2) support would come later (preference is Vulkan) as second phase. A Wayland only build is no longer directly pulling in X11.

@jwinarske jwinarske force-pushed the jw/xdg_shell branch 2 times, most recently from 1fc14ac to ff06a73 Compare June 26, 2022 19:10
@jwinarske @pfpacket
highgui Wayland xdg_shell
0769bf4 
-enable using -DWITH_WAYLAND=ON
-adapted from https://github.com/pfpacket/opencv-wayland
-using xdg_shell stable protocol
-overrides HAVE_QT if HAVE_WAYLAND and WITH_WAYLAND are set

Signed-off-by: Joel Winarske <joel.winarske@gmail.com>

Co-authored-by: Ryo Munakata <afpacket@gmail.com>
@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 27, 2022

/cc @pfpacket

@pfpacket
Copy link
Copy Markdown
Contributor

pfpacket commented Jun 28, 2022

Signed-off-by: Ryo Munakata <ryomnktml@gmail.com>

Anyway, it seems like the branch doesn't work now (at least in my environment).

@jwinarske
Copy link
Copy Markdown
Contributor Author

jwinarske commented Jun 29, 2022

@pfpacket
This is what I'm using to build/test with:
-DWITH_WAYLAND=ON -DWITH_GTK=OFF -DCMAKE_STAGING_PREFIX=/b/opencv/out/debug -DBUILD_EXAMPLES=ON

@pfpacket
Copy link
Copy Markdown
Contributor

pfpacket commented Jun 30, 2022

@jwinarske
Build was just fine. When I tried your branch a few days ago example programs couldn't display wayland surfaces. Now they did work. So that was my problem then.

@opencv-pushbot opencv-pushbot merged commit 16b5fd4 into opencv:4.x Jul 4, 2022
@jwinarske jwinarske deleted the jw/xdg_shell branch July 6, 2022 00:30
@alalek alalek mentioned this pull request Aug 21, 2022
Merged
@JsGjKJzi JsGjKJzi mentioned this pull request Apr 26, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

+1 more reviewer

@fooishbar fooishbar fooishbar left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@alalek alalek

Labels

category: highgui-gui feature

Projects

None yet

Milestone

4.7.0

Development

Successfully merging this pull request may close these issues.

5 participants

@jwinarske @fooishbar @alalek @pfpacket @opencv-pushbot