Update wayland to 1.21.0

This commit is contained in:
Ilya Fedin 2022-08-09 11:48:54 +04:00 committed by John Preston
parent 2065616592
commit f874876b00

View file

@ -19,7 +19,7 @@ ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/loc
RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
&& yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm \
&& yum -y install centos-release-scl \
&& yum -y install git meson ninja-build autoconf automake libtool patch \
&& yum -y install git python3-pip autoconf automake libtool patch \
fontconfig-devel freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \
pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel mesa-libgbm-devel \
libdrm-devel vulkan-devel gtk3-devel \
@ -29,6 +29,9 @@ RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
llvm-toolset-7.0-llvm-devel \
&& yum clean all
RUN python3 -m pip install meson
RUN python3 -m pip install ninja
# Fix a bug with argument naming in CentOS 7 glibc
RUN sed -i 's/char \*__block/char */' /usr/include/unistd.h
@ -283,7 +286,7 @@ RUN git clone -b libXcomposite-0.4.5 --depth=1 {{ GIT_FREEDESKTOP }}/libxcomposi
FROM builder AS wayland
COPY --link --from=libffi {{ LibrariesPath }}/libffi-cache /
RUN git clone -b 1.20.0 --depth=1 {{ GIT_FREEDESKTOP }}/wayland.git \
RUN git clone -b 1.21.0 --depth=1 {{ GIT_FREEDESKTOP }}/wayland.git \
&& cd wayland \
&& meson build \
--buildtype=release \