diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index f15a32999f..1ffcec8324 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -28,7 +28,8 @@ jobs: wine32 \ wine64 \ xvfb \ - winbind + winbind \ + zstd # Configure Wine export DISPLAY=:99 @@ -72,6 +73,15 @@ jobs: # Enable site-packages in embeddable python (needed for some scripts) sed -i 's/#import site/import site/' python/python312._pth + # Download libiconv (needed for FFmpeg) + wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-libiconv-1.17-3-any.pkg.tar.zst + # Extract zst using tar (if system tar supports it) or zstd + # We installed p7zip-full, but tar with zstd is cleaner if available. + # Let's install zstd in the apt step. + tar -I zstd -xf mingw-w64-x86_64-libiconv-1.17-3-any.pkg.tar.zst -C tools/ + # The package extracts to mingw64/, move it to iconv/ + mv tools/mingw64 tools/iconv + - name: Setup Environment and Scripts run: | # Patch libusb CMakeLists.txt to use native CMake build instead of autoconf on MinGW @@ -82,7 +92,7 @@ jobs: echo "set PATH=tools\llvm\bin;tools\cmake\bin;tools\ninja;tools\python;tools\utils;%PATH%" >> configure.bat echo "set CC=clang" >> configure.bat echo "set CXX=clang++" >> configure.bat - echo "cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DYUZU_TESTS=OFF -DYUZU_USE_BUNDLED_OPENSSL=ON -DYUZU_USE_BUNDLED_FFMPEG=ON -DYUZU_USE_BUNDLED_SDL2=ON -DYUZU_USE_BUNDLED_QT=ON -DYUZU_USE_CPM=ON -DCMAKE_PREFIX_PATH=tools\llvm\x86_64-w64-mingw32" >> configure.bat + echo "cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DYUZU_TESTS=OFF -DYUZU_USE_BUNDLED_OPENSSL=ON -DYUZU_USE_BUNDLED_FFMPEG=ON -DYUZU_USE_BUNDLED_SDL2=ON -DYUZU_USE_BUNDLED_QT=ON -DYUZU_USE_CPM=ON -DCMAKE_PREFIX_PATH=\"tools\llvm\x86_64-w64-mingw32;tools\iconv\"" >> configure.bat # Create build script echo "@echo off" > build_eden.bat