wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

ci: Update Mesa to version 24.2.4.

Browse Source 
This fixes a number of CI failures with llvmpipe.
This commit is contained in:
Giovanni Mascellani 2024-11-12 22:29:38 +01:00 committed by Henri Verbeet
parent 4c9821e5d5
commit c010fb63a1
Notes: Henri Verbeet 2024-11-13 16:31:34 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1261
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gitlab/image.docker
View File

@ -8,6 +8,12 @@ WORKDIR /tmp
# we also have to drop the executables, but we don't care about those # we also have to drop the executables, but we don't care about those
# anyway. # anyway.
# Mesa requires Meson >= 1.1.0, which is not available on Debian bookworm.
# Fortunately that can be worked around by removing some features from
# meson.build, which are not needed for llvmpipe. Notice that we use
# "git show | patch -R" instead of "git revert" so we don't have to configure
# a valid email and user name for git.
RUN export DEBIAN_FRONTEND=noninteractive; \ RUN export DEBIAN_FRONTEND=noninteractive; \
echo 'path-exclude=/usr/share/doc/*' > /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \ echo 'path-exclude=/usr/share/doc/*' > /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \
echo 'path-exclude=/usr/share/locale/*' >> /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \ echo 'path-exclude=/usr/share/locale/*' >> /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \
@ -71,8 +77,10 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
dpkg -i spirv-tools_*.deb && \ dpkg -i spirv-tools_*.deb && \
rm -fr * && \ rm -fr * && \
git clone --depth 1 --branch mesa-24.0.3 https://gitlab.freedesktop.org/mesa/mesa.git && \ git clone --branch mesa-24.2.4 https://gitlab.freedesktop.org/mesa/mesa.git && \
cd mesa && \ cd mesa && \
git show 876db9135048 | patch -p1 -R && \
sed -i -e '981,991d' meson.build && \
mkdir build && \ mkdir build && \
cd build && \ cd build && \
meson setup --buildtype release -Dprefix=/opt/mesa24 -Dplatforms= -Dvideo-codecs= -Dvulkan-drivers=swrast -Dgallium-drivers=swrast -Dopengl=true -Degl=enabled -Dglvnd=true -Dshared-glapi=enabled -Dglx=disabled -Dgles1=disabled -Dgles2=disabled .. && \ meson setup --buildtype release -Dprefix=/opt/mesa24 -Dplatforms= -Dvideo-codecs= -Dvulkan-drivers=swrast -Dgallium-drivers=swrast -Dopengl=true -Degl=enabled -Dglvnd=true -Dshared-glapi=enabled -Dglx=disabled -Dgles1=disabled -Dgles2=disabled .. && \