mirror of
https://github.com/opencv/opencv.git
synced 2026-07-21 19:33:03 +04:00
Merge pull request #25496 from Kumataro:fix25495
highgui: wayland: show "NO" status if dependency is missing #25496 Close #25495 - [doc] Add document to enable Wayland highgui-backend in ubuntu 24.04. - [build] Show "NO" status instead of version if dependency library is missing. - [build] Fix to find Wayland EGL. - [fix] Add some callback stub functions to suppress build warning. ### 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
This commit is contained in:
@@ -9,7 +9,7 @@ macro(ocv_wayland_generate protocol_file output_file)
|
||||
list(APPEND WAYLAND_PROTOCOL_SOURCES ${output_file}.h ${output_file}.c)
|
||||
endmacro()
|
||||
|
||||
ocv_clear_vars(HAVE_WAYLAND_CLIENT HAVE_WAYLAND_CURSOR HAVE_XKBCOMMON HAVE_WAYLAND_PROTOCOLS)
|
||||
ocv_clear_vars(HAVE_WAYLAND_CLIENT HAVE_WAYLAND_CURSOR HAVE_XKBCOMMON HAVE_WAYLAND_PROTOCOLS HAVE_WAYLAND_EGL)
|
||||
if(WITH_WAYLAND)
|
||||
ocv_check_modules(WAYLAND_CLIENT wayland-client)
|
||||
if(WAYLAND_CLIENT_FOUND)
|
||||
@@ -32,4 +32,10 @@ if(WITH_WAYLAND)
|
||||
if(HAVE_WAYLAND_CLIENT AND HAVE_WAYLAND_CURSOR AND HAVE_XKBCOMMON AND HAVE_WAYLAND_PROTOCOLS)
|
||||
set(HAVE_WAYLAND TRUE)
|
||||
endif()
|
||||
|
||||
# WAYLAND_EGL is option
|
||||
ocv_check_modules(WAYLAND_EGL wayland-egl)
|
||||
if(WAYLAND_EGL_FOUND)
|
||||
set(HAVE_WAYLAND_EGL ON)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -231,7 +231,13 @@ private:
|
||||
&handle_pointer_motion, &handle_pointer_button,
|
||||
&handle_pointer_axis, &handle_pointer_frame,
|
||||
&handle_pointer_axis_source, &handle_pointer_axis_stop,
|
||||
&handle_pointer_axis_discrete
|
||||
&handle_pointer_axis_discrete,
|
||||
#if WL_POINTER_AXIS_VALUE120_SINCE_VERSION >= 8
|
||||
&handle_axis_value120,
|
||||
#endif
|
||||
#if WL_POINTER_AXIS_RELATIVE_DIRECTION_SINCE_VERSION >= 9
|
||||
&handle_axis_relative_direction,
|
||||
#endif
|
||||
};
|
||||
cv_wl_window *focus_window_{};
|
||||
|
||||
@@ -277,6 +283,27 @@ private:
|
||||
CV_UNUSED(axis);
|
||||
CV_UNUSED(discrete);
|
||||
}
|
||||
|
||||
#if WL_POINTER_AXIS_VALUE120_SINCE_VERSION >= 8
|
||||
static void
|
||||
handle_axis_value120(void *data, struct wl_pointer *wl_pointer, uint32_t axis, int32_t value120) {
|
||||
CV_UNUSED(data);
|
||||
CV_UNUSED(wl_pointer);
|
||||
CV_UNUSED(axis);
|
||||
CV_UNUSED(value120);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if WL_POINTER_AXIS_RELATIVE_DIRECTION_SINCE_VERSION >= 9
|
||||
static void
|
||||
handle_axis_relative_direction(void *data, struct wl_pointer *wl_pointer, uint32_t axis, uint32_t direction) {
|
||||
CV_UNUSED(data);
|
||||
CV_UNUSED(wl_pointer);
|
||||
CV_UNUSED(axis);
|
||||
CV_UNUSED(direction);
|
||||
}
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
class cv_wl_keyboard {
|
||||
@@ -695,7 +722,13 @@ private:
|
||||
};
|
||||
struct xdg_toplevel *xdg_toplevel_;
|
||||
struct xdg_toplevel_listener xdgtop_listener_{
|
||||
&handle_toplevel_configure, &handle_toplevel_close
|
||||
&handle_toplevel_configure, &handle_toplevel_close,
|
||||
#if XDG_TOPLEVEL_CONFIGURE_BOUNDS_SINCE_VERSION >= 4
|
||||
&handle_toplevel_configure_bounds,
|
||||
#endif
|
||||
#if XDG_TOPLEVEL_WM_CAPABILITIES_SINCE_VERSION >= 5
|
||||
&handle_toplevel_wm_capabilities,
|
||||
#endif
|
||||
};
|
||||
bool wait_for_configure_ = true;
|
||||
|
||||
@@ -742,6 +775,27 @@ private:
|
||||
|
||||
static void handle_toplevel_close(void *data, struct xdg_toplevel *surface);
|
||||
|
||||
#if XDG_TOPLEVEL_CONFIGURE_BOUNDS_SINCE_VERSION >= 4
|
||||
static void
|
||||
handle_toplevel_configure_bounds(void *data, struct xdg_toplevel *xdg_toplevel, int32_t width, int32_t height)
|
||||
{
|
||||
CV_UNUSED(data);
|
||||
CV_UNUSED(xdg_toplevel);
|
||||
CV_UNUSED(width);
|
||||
CV_UNUSED(height);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if XDG_TOPLEVEL_WM_CAPABILITIES_SINCE_VERSION >= 5
|
||||
static void
|
||||
handle_toplevel_wm_capabilities(void *data, struct xdg_toplevel *xdg_toplevel, struct wl_array *capabilities)
|
||||
{
|
||||
CV_UNUSED(data);
|
||||
CV_UNUSED(xdg_toplevel);
|
||||
CV_UNUSED(capabilities);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void handle_frame_callback(void *data, struct wl_callback *cb, uint32_t time);
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user