[Scummvm-git-logs] scummvm master -> ad429961f025c9bec7eaad22991e894a433fe73e

[ccawley2011]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a110d967c2 Revert "CI: Disable win32 and x64 builds because they're broken"
ad429961f0 CI: Disable fribidi for all MSVC builds


Commit: a110d967c2618d60c111e90b18a5abce55f8ff98
    https://github.com/scummvm/scummvm/commit/a110d967c2618d60c111e90b18a5abce55f8ff98
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-07-23T11:15:49+01:00

Commit Message:
Revert "CI: Disable win32 and x64 builds because they're broken"

This reverts commit 00ceb9d9d39a653879649c145dae2220997f76de.

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cb18b21271..93eb43064c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - platform: win32
+            triplet: x86-windows
+            arch: x86
+            vcpkgPackages: 'curl faad2 fluidsynth freetype fribidi libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
+            useNasm: 'true'
+          - platform: x64
+            arch: x64
+            triplet: x64-windows
+            vcpkgPackages: 'curl faad2 fluidsynth freetype fribidi libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
           - platform: arm64
             arch: arm64
             triplet: arm64-windows


Commit: ad429961f025c9bec7eaad22991e894a433fe73e
    https://github.com/scummvm/scummvm/commit/ad429961f025c9bec7eaad22991e894a433fe73e
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-07-23T11:15:49+01:00

Commit Message:
CI: Disable fribidi for all MSVC builds

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93eb43064c..329c659d47 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,15 +11,22 @@ jobs:
           - platform: win32
             triplet: x86-windows
             arch: x86
-            vcpkgPackages: 'curl faad2 fluidsynth freetype fribidi libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
+            # fribidi is disabled due to timeouts when installing the package
+            configFlags: --enable-faad --enable-mpeg2 --disable-fribidi
+            vcpkgPackages: 'curl faad2 fluidsynth freetype libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
             useNasm: 'true'
           - platform: x64
             arch: x64
             triplet: x64-windows
-            vcpkgPackages: 'curl faad2 fluidsynth freetype fribidi libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
+            # fribidi is disabled due to timeouts when installing the package
+            configFlags: --enable-faad --enable-mpeg2 --disable-fribidi
+            vcpkgPackages: 'curl faad2 fluidsynth freetype libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
           - platform: arm64
             arch: arm64
             triplet: arm64-windows
+            # fribidi is disabled due to https://github.com/microsoft/vcpkg/issues/11248 [fribidi] Fribidi doesn't cross-compile on x86-64 to target arm/arm64
+            # Note that fribidi is also disabled on arm64 in devtools/create_project/msvc.cpp
+            configFlags: --enable-faad --enable-mpeg2 --disable-fribidi
             vcpkgPackages: 'curl faad2 fluidsynth freetype libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
     env:
       CONFIGURATION: Release
@@ -52,7 +59,7 @@ jobs:
         run: |
           mkdir build-scummvm
           cd build-scummvm
-          ../devtools/create_project/cmake/Debug/create_project.exe .. --msvc --enable-all-engines --enable-faad --enable-mpeg2 --use-canonical-lib-names
+          ../devtools/create_project/cmake/Debug/create_project.exe .. --msvc --enable-all-engines ${{ matrix.configflags }} --use-canonical-lib-names
           ls
       - name: set SCUMMVM_LIBS env variable
         run: |