From eae06bcdebdf45c3b24c6e9b5e936b01440864b6 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Fri, 31 Oct 2025 21:43:52 +0100 Subject: [PATCH] Docker: remove wayland and openblas --- docker/rocky8/Dockerfile | 5 ----- docker/rocky9/Dockerfile | 5 ----- docker/ubuntu2204/Dockerfile | 2 -- docker/ubuntu2404/Dockerfile | 3 --- viewer/CMakeLists.txt | 2 +- 5 files changed, 1 insertion(+), 16 deletions(-) diff --git a/docker/rocky8/Dockerfile b/docker/rocky8/Dockerfile index ac219bf3..2173bab7 100644 --- a/docker/rocky8/Dockerfile +++ b/docker/rocky8/Dockerfile @@ -40,7 +40,6 @@ RUN dnf -y update && \ xcb-util-devel \ libxkbcommon-devel \ libxkbcommon-x11-devel \ - wayland-devel \ libX11-devel \ libXext-devel \ libXrender-devel \ @@ -68,9 +67,6 @@ RUN dnf -y update && \ python3-setuptools \ python3-wheel \ twine \ - openblas \ - openblas-static \ - openblas-devel \ libdrm-devel \ libglvnd-core-devel \ libglvnd-devel \ @@ -184,7 +180,6 @@ 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 004acb46..f8f610a9 100644 --- a/docker/rocky9/Dockerfile +++ b/docker/rocky9/Dockerfile @@ -61,14 +61,10 @@ RUN dnf -y update && \ eigen3-devel \ zlib-static \ fontconfig-devel \ - openblas-devel \ - openblas-static \ - openblas-serial \ mesa-dri-drivers \ libdrm-devel \ libglvnd-core-devel \ libglvnd-devel \ - wayland-devel \ freetype-devel && \ dnf clean all && rm -rf /var/cache/dnf @@ -173,7 +169,6 @@ 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 b2d91410..f1625475 100644 --- a/docker/ubuntu2204/Dockerfile +++ b/docker/ubuntu2204/Dockerfile @@ -71,14 +71,12 @@ RUN set -eux; \ zlib1g-dev \ libglib2.0-dev \ libfontconfig1-dev \ - libopenblas-dev \ libfftw3-dev \ libeigen3-dev \ libdrm-dev \ mesa-utils \ libassimp-dev \ libglvnd-dev \ - libwayland-dev \ libfreetype6-dev; \ apt-get -y install gcc-12 g++-12; \ apt-get clean; \ diff --git a/docker/ubuntu2404/Dockerfile b/docker/ubuntu2404/Dockerfile index 8d7d7d84..f1e7c2d8 100644 --- a/docker/ubuntu2404/Dockerfile +++ b/docker/ubuntu2404/Dockerfile @@ -65,14 +65,11 @@ RUN set -eux; \ zlib1g-dev \ libglib2.0-dev \ 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 045156fb..8c018458 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::QWaylandIntegrationPlugin) +qt_import_plugins(jfjoch_viewer INCLUDE Qt::QXcbIntegrationPlugin)