From 9f041539354f485ba0b46a9c538b194617d3e72f Mon Sep 17 00:00:00 2001 From: takase1121 <20792268+takase1121@users.noreply.github.com> Date: Tue, 10 Dec 2024 10:31:29 +0800 Subject: [PATCH] images: install wayland and wayland-protocols manually --- docker/Dockerfile-manylinux | 26 +++++++++++++++++++++++--- docker/Dockerfile-ubuntu | 3 ++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile-manylinux b/docker/Dockerfile-manylinux index 0b3dc6e..380490b 100644 --- a/docker/Dockerfile-manylinux +++ b/docker/Dockerfile-manylinux @@ -47,8 +47,9 @@ RUN if [[ $TARGETARCH = 'arm64' ]]; then \ # install deps RUN yum -y update && \ - yum -y install wget curl zip unzip ccache fuse fuse3 sudo \ - libX11-devel libXi-devel libXcursor-devel libxkbcommon-devel libXrandr-devel wayland-devel wayland-protocols-devel dbus-devel ibus-devel SDL2-devel \ + yum -y install wget curl zip unzip ccache fuse fuse3 sudo cmake \ + mesa-libGL-devel mesa-libEGL-devel mesa-libgbm-devel libX11-devel libXi-devel libXcursor-devel libxkbcommon-devel libXrandr-devel libXrender-devel \ + libXext-devel libXinerama-devel dbus-devel ibus-devel libxml2-devel \ gcc-aarch64-linux-gnu gcc-c++-aarch64-linux-gnu binutils-aarch64-linux-gnu && \ yum -y clean all && \ rm -fr /var/cache @@ -56,6 +57,24 @@ RUN yum -y update && \ # install meson and ninja RUN pip install --no-cache-dir --no-compile meson ninja +# install and build wayland +RUN wget https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.23.0/downloads/wayland-1.23.0.tar.xz && \ + tar -xJf wayland-1.23.0.tar.xz && \ + cd wayland-1.23.0 && \ + meson setup build --prefix=/usr -Dtests=false -Ddocumentation=false && \ + meson install -C build && \ + cd .. && \ + rm -rf wayland-1.23.0 + +# install and build wayland-protocols +RUN wget https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.38/downloads/wayland-protocols-1.38.tar.xz && \ + tar -xJf wayland-protocols-1.38.tar.xz && \ + cd wayland-protocols-1.38 && \ + meson setup build --prefix=/usr -Dtests=false && \ + meson install -C build && \ + cd .. && \ + rm -rf wayland-protocols-1.38 + # install appimagetool and friends RUN set -eux; \ arch=; \ @@ -121,4 +140,5 @@ RUN rpm -i --force --nodeps --ignorearch "https://pkgs.sysadmins.ws/el8/extras/x touch /usr/lib64/libdecor-0.so /usr/lib64/libdecor-0.so.0 && \ yum -y history sync && \ yum -y clean all && \ - rm -fr /var/cache \ No newline at end of file + rm -fr /var/cache + diff --git a/docker/Dockerfile-ubuntu b/docker/Dockerfile-ubuntu index 523b2b1..7d50c29 100644 --- a/docker/Dockerfile-ubuntu +++ b/docker/Dockerfile-ubuntu @@ -110,4 +110,5 @@ RUN wget "http://archive.ubuntu.com/ubuntu/pool/main/libd/libdecor-0/libdecor-0- dpkg --force-all -i "libdecor-0-dev_0.1.0-3build1_amd64.deb" && \ rm -f "libdecor-0-dev_0.1.0-3build1_amd64.deb" && \ perl -i~ -pe 's|\QDepends: libdecor-0-0 (= 0.1.0-3build1), libwayland-dev\E\n||g' /var/lib/dpkg/status && \ - touch /usr/lib/$(dpkg-architecture -q DEB_TARGET_MULTIARCH)/libdecor-0.so /usr/lib/$(dpkg-architecture -q DEB_TARGET_MULTIARCH)/libdecor-0.so.0 \ No newline at end of file + touch /usr/lib/$(dpkg-architecture -q DEB_TARGET_MULTIARCH)/libdecor-0.so /usr/lib/$(dpkg-architecture -q DEB_TARGET_MULTIARCH)/libdecor-0.so.0 +