diff options
| -rwxr-xr-x | TOOLS/appveyor-build.sh | 9 | ||||
| -rwxr-xr-x | TOOLS/appveyor-install.sh | 62 | ||||
| -rw-r--r-- | appveyor.yml | 4 |
3 files changed, 59 insertions, 16 deletions
diff --git a/TOOLS/appveyor-build.sh b/TOOLS/appveyor-build.sh index f6c94fb90b..8796118df3 100755 --- a/TOOLS/appveyor-build.sh +++ b/TOOLS/appveyor-build.sh @@ -10,7 +10,10 @@ export PYTHON=/usr/bin/python3 "$PYTHON" bootstrap.py "$PYTHON" waf configure \ --check-c-compiler=gcc \ - --disable-cdda \ + --disable-egl-angle-lib \ + --enable-crossc \ + --enable-d3d-hwaccel \ + --enable-d3d11 \ --enable-egl-angle \ --enable-jpeg \ --enable-lcms2 \ @@ -18,5 +21,7 @@ export PYTHON=/usr/bin/python3 --enable-libass \ --enable-lua \ --enable-rubberband \ - --enable-uchardet + --enable-shaderc \ + --enable-uchardet \ + --enable-vulkan "$PYTHON" waf build diff --git a/TOOLS/appveyor-install.sh b/TOOLS/appveyor-install.sh index b0d276eab7..6ae8f34ea3 100755 --- a/TOOLS/appveyor-install.sh +++ b/TOOLS/appveyor-install.sh @@ -1,15 +1,6 @@ #!/usr/bin/bash set -e -case $MSYSTEM in -MINGW32) - export MINGW_PACKAGE_PREFIX=mingw-w64-i686 - ;; -MINGW64) - export MINGW_PACKAGE_PREFIX=mingw-w64-x86_64 - ;; -esac - # Write an empty fonts.conf to speed up fc-cache export FONTCONFIG_FILE=/dummy-fonts.conf cat >"$FONTCONFIG_FILE" <<EOF @@ -20,16 +11,63 @@ EOF # Install build dependencies for mpv pacman -S --noconfirm --needed \ - $MINGW_PACKAGE_PREFIX-gcc \ + $MINGW_PACKAGE_PREFIX-toolchain \ $MINGW_PACKAGE_PREFIX-angleproject-git \ - $MINGW_PACKAGE_PREFIX-ffmpeg \ + $MINGW_PACKAGE_PREFIX-cmake \ $MINGW_PACKAGE_PREFIX-lcms2 \ $MINGW_PACKAGE_PREFIX-libarchive \ $MINGW_PACKAGE_PREFIX-libass \ $MINGW_PACKAGE_PREFIX-libjpeg-turbo \ $MINGW_PACKAGE_PREFIX-lua51 \ + $MINGW_PACKAGE_PREFIX-ninja \ $MINGW_PACKAGE_PREFIX-rubberband \ - $MINGW_PACKAGE_PREFIX-uchardet + $MINGW_PACKAGE_PREFIX-uchardet \ + $MINGW_PACKAGE_PREFIX-vulkan # Delete unused packages to reduce space used in the Appveyor cache pacman -Sc --noconfirm + +# Compile ffmpeg-mpv +( + git clone --depth=1 https://github.com/mpv-player/ffmpeg-mpv.git && cd ffmpeg-mpv + + mkdir build && cd build + ../configure \ + --prefix=$MINGW_PREFIX \ + --target-os=mingw32 \ + --arch=$MSYSTEM_CARCH \ + --disable-static \ + --disable-doc \ + --disable-asm \ + --enable-gpl \ + --enable-version3 \ + --enable-shared \ + --enable-pic \ + --enable-d3d11va \ + --enable-dxva2 \ + --enable-schannel + make -j4 install +) + +# Compile shaderc +( + git clone --depth=1 https://github.com/google/shaderc && cd shaderc + git clone --depth=1 https://github.com/google/glslang.git third_party/glslang + git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Tools.git third_party/spirv-tools + git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers.git third_party/spirv-headers + + mkdir build && cd build + cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DSHADERC_SKIP_TESTS=ON \ + -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX .. + ninja install + cp -f libshaderc/libshaderc_shared.dll $MINGW_PREFIX/bin/ +) + +# Compile crossc +( + git clone --depth=1 https://github.com/rossy/crossc && cd crossc + git submodule init + git submodule update + + make -j4 install prefix=$MINGW_PREFIX +) diff --git a/appveyor.yml b/appveyor.yml index 4224adcfc1..47a87c2f4d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,9 +19,9 @@ install: # Update non-core packages - C:\msys64\usr\bin\pacman -Suu --noconfirm # Install required MSYS2 packages - - C:\msys64\usr\bin\pacman -S --noconfirm --needed perl python pkg-config + - C:\msys64\usr\bin\pacman -S --noconfirm --needed base-devel perl python pkg-config # Now MSYS2 is up to date, do the rest of the install from a bash script - - C:\msys64\usr\bin\bash -lc "cd \"$APPVEYOR_BUILD_FOLDER\" && exec ./TOOLS/appveyor-install.sh" + - C:\msys64\usr\bin\bash -lc "cd && exec \"$APPVEYOR_BUILD_FOLDER\"/TOOLS/appveyor-install.sh" build_script: - C:\msys64\usr\bin\bash -lc "cd \"$APPVEYOR_BUILD_FOLDER\" && exec ./TOOLS/appveyor-build.sh" on_failure: |