From 2e4748fa3ef564f25a7bccc530fdb53d43acb75f Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Thu, 30 Oct 2025 21:06:09 +0100 Subject: [PATCH] jfjoch_viewer: Add wayland support --- docker/rocky8/Dockerfile | 2 ++ docker/rocky9/Dockerfile | 2 ++ docker/ubuntu2204/Dockerfile | 2 ++ docker/ubuntu2404/Dockerfile | 2 ++ viewer/CMakeLists.txt | 2 +- 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docker/rocky8/Dockerfile b/docker/rocky8/Dockerfile index 8b3bef04..e2721a34 100644 --- a/docker/rocky8/Dockerfile +++ b/docker/rocky8/Dockerfile @@ -37,6 +37,7 @@ RUN dnf -y update && \ xcb-util-devel \ libxkbcommon-devel \ libxkbcommon-x11-devel \ + libwayland-devel \ libX11-devel \ libXext-devel \ libXrender-devel \ @@ -120,6 +121,7 @@ RUN set -eux; \ -DQT_FEATURE_xcb=ON \ -DQT_FEATURE_xcb_xlib=OFF \ -DQT_FEATURE_xkbcommon_x11=ON \ + -DQT_FEATURE_wayland_client=ON \ -DQT_FEATURE_opengl=ON \ -DQT_FEATURE_opengl_desktop=ON \ -DQT_FEATURE_opengl_dynamic=OFF \ diff --git a/docker/rocky9/Dockerfile b/docker/rocky9/Dockerfile index 78fc11b9..cb1d2468 100644 --- a/docker/rocky9/Dockerfile +++ b/docker/rocky9/Dockerfile @@ -62,6 +62,7 @@ RUN dnf -y update && \ libdrm-devel \ libglvnd-core-devel \ libglvnd-devel \ + libwayland-devel \ freetype-devel && \ dnf clean all && rm -rf /var/cache/dnf @@ -107,6 +108,7 @@ RUN set -eux; \ -DQT_FEATURE_xcb=ON \ -DQT_FEATURE_xcb_xlib=OFF \ -DQT_FEATURE_xkbcommon_x11=ON \ + -DQT_FEATURE_wayland_client=ON \ -DQT_FEATURE_opengl=ON \ -DQT_FEATURE_opengl_desktop=ON \ -DQT_FEATURE_opengl_dynamic=OFF \ diff --git a/docker/ubuntu2204/Dockerfile b/docker/ubuntu2204/Dockerfile index 73bb6368..312b594d 100644 --- a/docker/ubuntu2204/Dockerfile +++ b/docker/ubuntu2204/Dockerfile @@ -74,6 +74,7 @@ RUN set -eux; \ mesa-utils \ libassimp-dev \ libglvnd-dev \ + libwayland-dev \ libfreetype6-dev; \ apt-get -y install gcc-12 g++-12; \ apt-get clean; \ @@ -124,6 +125,7 @@ RUN set -eux; \ -DQT_FEATURE_xcb=ON \ -DQT_FEATURE_xcb_xlib=ON \ -DQT_FEATURE_xkbcommon_x11=ON \ + -DQT_FEATURE_wayland_client=ON \ -DQT_FEATURE_opengl=ON \ -DQT_FEATURE_opengl_desktop=ON \ -DQT_FEATURE_opengl_dynamic=OFF \ diff --git a/docker/ubuntu2404/Dockerfile b/docker/ubuntu2404/Dockerfile index aa513f47..eb59f2b7 100644 --- a/docker/ubuntu2404/Dockerfile +++ b/docker/ubuntu2404/Dockerfile @@ -65,10 +65,12 @@ RUN set -eux; \ libfontconfig1-dev \ libopenblas-dev \ libfftw3-dev \ + libwayland-dev \ qt6-base-dev \ qt6-charts-dev \ qt6-tools-dev \ qt6-3d-dev \ + qt6-wayland-dev \ libeigen3-dev \ libfreetype6-dev; \ apt-get clean; \ diff --git a/viewer/CMakeLists.txt b/viewer/CMakeLists.txt index 8311dc12..045156fb 100644 --- a/viewer/CMakeLists.txt +++ b/viewer/CMakeLists.txt @@ -69,4 +69,4 @@ INSTALL( COMPONENT viewer ) -qt_import_plugins(jfjoch_viewer INCLUDE Qt::QLibInputPlugin Qt::QXcbIntegrationPlugin) +qt_import_plugins(jfjoch_viewer INCLUDE Qt::QLibInputPlugin Qt::QXcbIntegrationPlugin Qt::QWaylandIntegrationPlugin)