summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossy@jrg.systems>2019-06-17 20:46:39 +1000
committerJan Ekström <jeebjp@gmail.com>2019-07-03 17:30:50 +0300
commitea91162802432aabc8a86216d56223f690e49a67 (patch)
tree2dd9ea20b8481a63d74c591e55660038421c9afa
parentc9e7473d67893d9248bedf63530a1e0325a3036a (diff)
downloadmpv-ea91162802432aabc8a86216d56223f690e49a67.tar.bz2
mpv-ea91162802432aabc8a86216d56223f690e49a67.tar.xz
appveyor: remove broken packages, install libplacebo
Support for Ada and Objective-C was removed from MSYS2, which made pacman refuse to update GCC while the gcc-ada and gcc-objc packages were installed. Remove those packages before updating the others. Also remove ANGLE, which has been removed from MSYS2, and add libplacebo, which is now needed for the Vulkan VO.
-rwxr-xr-xTOOLS/appveyor-build.sh2
-rwxr-xr-xTOOLS/appveyor-install.sh2
-rw-r--r--appveyor.yml6
3 files changed, 7 insertions, 3 deletions
diff --git a/TOOLS/appveyor-build.sh b/TOOLS/appveyor-build.sh
index 0c3aaacedd..8e16fbeee1 100755
--- a/TOOLS/appveyor-build.sh
+++ b/TOOLS/appveyor-build.sh
@@ -10,11 +10,9 @@ export PYTHON=/usr/bin/python3
"$PYTHON" bootstrap.py
"$PYTHON" waf configure \
--check-c-compiler=gcc \
- --disable-egl-angle-lib \
--enable-spirv-cross \
--enable-d3d-hwaccel \
--enable-d3d11 \
- --enable-egl-angle \
--enable-jpeg \
--enable-lcms2 \
--enable-libarchive \
diff --git a/TOOLS/appveyor-install.sh b/TOOLS/appveyor-install.sh
index 15595facf0..7b2473f39d 100755
--- a/TOOLS/appveyor-install.sh
+++ b/TOOLS/appveyor-install.sh
@@ -14,12 +14,12 @@ EOF
# Install build dependencies for mpv
pacman -S --noconfirm --needed \
$MINGW_PACKAGE_PREFIX-toolchain \
- $MINGW_PACKAGE_PREFIX-angleproject-git \
$MINGW_PACKAGE_PREFIX-cmake \
$MINGW_PACKAGE_PREFIX-lcms2 \
$MINGW_PACKAGE_PREFIX-libarchive \
$MINGW_PACKAGE_PREFIX-libass \
$MINGW_PACKAGE_PREFIX-libjpeg-turbo \
+ $MINGW_PACKAGE_PREFIX-libplacebo \
$MINGW_PACKAGE_PREFIX-lua51 \
$MINGW_PACKAGE_PREFIX-ninja \
$MINGW_PACKAGE_PREFIX-rubberband \
diff --git a/appveyor.yml b/appveyor.yml
index 90daa1648a..1b272a5f96 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,6 +15,12 @@ shallow_clone: true
test: off
install:
+ # Support for Ada and Objective-C was removed from MSYS2. GCC won't update if
+ # these packages are installed.
+ - >-
+ C:\msys64\usr\bin\pacman -R --noconfirm --noprogressbar
+ mingw-w64-i686-gcc-ada mingw-w64-i686-gcc-objc mingw-w64-x86_64-gcc-ada
+ mingw-w64-x86_64-gcc-objc
# Update core packages
- C:\msys64\usr\bin\pacman -Syyuu --noconfirm --noprogressbar --ask=20
# Update non-core packages