Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install 32-bit version of xvfb in 32-bit wxMSW cross-build

Browse Source 
libgl1:i386 conflicts with 64-bit version of xvfb in the latest Sid, so
try using 32-bit version of the latter.
This commit is contained in:
Vadim Zeitlin
2021-10-16 16:44:44 +02:00
parent 6fb64da922
commit fbb2ec85ef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci_msw_cross.yml vendored
View File

@@ -93,18 +93,18 @@ jobs:
- name: Install prerequisites - name: Install prerequisites
run: | run: |
packages="git make wine x11-xserver-utils xvfb" packages="git make wine x11-xserver-utils"
case "${HOST_TRIPLET}" in case "${HOST_TRIPLET}" in
x86_64-w64-mingw32) x86_64-w64-mingw32)
packages="$packages g++-mingw-w64-x86-64 wine64" packages="$packages g++-mingw-w64-x86-64 wine64 xvfb"
winerun=wine64 winerun=wine64
;; ;;
i686-w64-mingw32) i686-w64-mingw32)
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get -q -o=Dpkg::Use-Pty=0 update sudo apt-get -q -o=Dpkg::Use-Pty=0 update
packages="$packages g++-mingw-w64-i686 wine32 libgl1:i386" packages="$packages g++-mingw-w64-i686 wine32 libgl1:i386 xvfb:i386"
winerun=wine winerun=wine
;; ;;