gitlab-ci: install winehq-stable to get 5.0 instead of 4.0
Additionally, purge the winehq-stable package and its dependencies to avoid crashing when building for s390x. v2: - Remove winehq-stable and dependencies for s390x. Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2657 Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Daniel Stone <daniels@collabora.com> [v1] Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> Acked-by: Jason Ekstrand <jason@jlekstrand.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4678>
This commit is contained in:
parent
c8ccd63911
commit
cb055c6ca4
|
@ -133,7 +133,7 @@ x86_build:
|
|||
- .fdo.container-build@debian
|
||||
- .container
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: &x86_build "2020-03-18-jflags"
|
||||
FDO_DISTRIBUTION_TAG: &x86_build "2020-04-22-winehq"
|
||||
|
||||
.use-x86_build:
|
||||
variables:
|
||||
|
@ -548,7 +548,8 @@ meson-s390x:
|
|||
script:
|
||||
# For unknown reasons "too many" installed i386 libraries cause qemu to
|
||||
# crash while executing llvm-config for s390x.
|
||||
- apt-get remove -y libglib2.0-0:i386
|
||||
- apt-get purge -y winehq-stable
|
||||
- apt-get autoremove -y --purge
|
||||
- dpkg -i /var/cache/apt/archives/$CROSS/*.deb
|
||||
- .gitlab-ci/meson-build.sh
|
||||
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v2.0.15 (GNU/Linux)
|
||||
|
||||
mQENBFu8fWQBCADM64J7qlcnI2KwxSKSdyaOi7hz44EUXDpC3+3hfFP8k28SgV3U
|
||||
4a/ydOdd2cDSne5w+yjrnJWYuS0sTiE7vQPtKfmCmQZfCStvoRe5Pt+AOy1GA/iu
|
||||
U5wHIZD+/A9CeQcu5L3PkVkmijz0LmSCq7HnnVB0SdFA5eFlV98H875EasvpJ3xU
|
||||
ziI3yvqdZ5/0LgKzOiFjk4rMXQS01a1dNpwFO7EXiq921ZjnXatdnsDQ/NAj7z8P
|
||||
3qnTAj6yvl7DtdlXXA2hiznEOZNCRLZ69vHq0hGIw+OKjpsUkCZK29AnY4wJxxzY
|
||||
frjknVW7tyZ6Hxwz6R4vaVlZ6h5WR/OiAdqlABEBAAG0NEVtdWxhdG9ycyBPQlMg
|
||||
UHJvamVjdCA8RW11bGF0b3JzQGJ1aWxkLm9wZW5zdXNlLm9yZz6JAT4EEwEIACgF
|
||||
Alu8fWQCGwMFCQQesAAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEN+hdadR
|
||||
BJYOXVoH/Rd0dRx4SUx7KVjTrDfSuf6jXseyenkl4aQnp46n0MttatkoCdGVvyrq
|
||||
VWvGfO3MI122MnFKqia7Hep1HlcYGe2a5tW/w1SGGEy+VZduxcZCMmVuSnl+3ioG
|
||||
2fRGx3uoNBEGQIbZ5VVlABUJC+c/Vq1m6kT9Edz4XWRPHW1Nwjjfn79618ebGZMc
|
||||
R0fUM9L3GZw9V/kAK8kXmIL7rkglfewTbs6fByqAix79MjsNURAuCeIc5OmbxL4j
|
||||
LxuoNhnxxucB7YGBhCa9ZL8LYEIbdeyaJmgdHDoUQjz4peXibz5v+Er8mGOwuSLl
|
||||
y1U21T3huNf9Osjw52nxVcDmugBWqQKIRgQTEQIABgUCW7x9ZAAKCRA7MBG3a51l
|
||||
IwayAJ9dHmDag9nFY9GujfMr+foKquFS9wCfQlvp6Sz0N5aKdW00NGnZZ/EKHIQ=
|
||||
=uZyA
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
@ -20,6 +20,19 @@ apt-get install -y \
|
|||
apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key
|
||||
echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list
|
||||
|
||||
# Upstream Wine (WineHQ) package repository. We use the OBS service
|
||||
# instead of the repository at the winehq.org domain because:
|
||||
#
|
||||
# " The WineHQ packages for Debian 10 and later require libfaudio0
|
||||
# as a dependency. Since the distro does not provide it for Debian
|
||||
# 10, users of that version can download libfaudio0 packages from
|
||||
# the OBS. See https://forum.winehq.org/viewtopic.php?f=8&t=32192
|
||||
# for details."
|
||||
#
|
||||
# As explained at https://wiki.winehq.org/Debian
|
||||
apt-key add .gitlab-ci/container/obs-emulators-wine-debian.gpg.key
|
||||
echo 'deb https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_10/ ./' >/etc/apt/sources.list.d/obs-emulators-wine-debian.list
|
||||
|
||||
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
|
||||
echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
|
||||
|
||||
|
@ -118,9 +131,7 @@ apt-get install -y --no-remove \
|
|||
apt-get install -y --no-remove \
|
||||
libz-mingw-w64-dev \
|
||||
mingw-w64 \
|
||||
wine \
|
||||
wine32 \
|
||||
wine64
|
||||
winehq-stable
|
||||
|
||||
# Debian's pkg-config wrapers for mingw are broken, and there's no sign that
|
||||
# they're going to be fixed, so we'll just have to fix it ourselves
|
||||
|
|
Loading…
Reference in New Issue