mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 03:52:22 +02:00
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.
This commit is contained in:
parent
c9e7473d67
commit
ea91162802
@ -10,11 +10,9 @@ export PYTHON=/usr/bin/python3
|
|||||||
"$PYTHON" bootstrap.py
|
"$PYTHON" bootstrap.py
|
||||||
"$PYTHON" waf configure \
|
"$PYTHON" waf configure \
|
||||||
--check-c-compiler=gcc \
|
--check-c-compiler=gcc \
|
||||||
--disable-egl-angle-lib \
|
|
||||||
--enable-spirv-cross \
|
--enable-spirv-cross \
|
||||||
--enable-d3d-hwaccel \
|
--enable-d3d-hwaccel \
|
||||||
--enable-d3d11 \
|
--enable-d3d11 \
|
||||||
--enable-egl-angle \
|
|
||||||
--enable-jpeg \
|
--enable-jpeg \
|
||||||
--enable-lcms2 \
|
--enable-lcms2 \
|
||||||
--enable-libarchive \
|
--enable-libarchive \
|
||||||
|
@ -14,12 +14,12 @@ EOF
|
|||||||
# Install build dependencies for mpv
|
# Install build dependencies for mpv
|
||||||
pacman -S --noconfirm --needed \
|
pacman -S --noconfirm --needed \
|
||||||
$MINGW_PACKAGE_PREFIX-toolchain \
|
$MINGW_PACKAGE_PREFIX-toolchain \
|
||||||
$MINGW_PACKAGE_PREFIX-angleproject-git \
|
|
||||||
$MINGW_PACKAGE_PREFIX-cmake \
|
$MINGW_PACKAGE_PREFIX-cmake \
|
||||||
$MINGW_PACKAGE_PREFIX-lcms2 \
|
$MINGW_PACKAGE_PREFIX-lcms2 \
|
||||||
$MINGW_PACKAGE_PREFIX-libarchive \
|
$MINGW_PACKAGE_PREFIX-libarchive \
|
||||||
$MINGW_PACKAGE_PREFIX-libass \
|
$MINGW_PACKAGE_PREFIX-libass \
|
||||||
$MINGW_PACKAGE_PREFIX-libjpeg-turbo \
|
$MINGW_PACKAGE_PREFIX-libjpeg-turbo \
|
||||||
|
$MINGW_PACKAGE_PREFIX-libplacebo \
|
||||||
$MINGW_PACKAGE_PREFIX-lua51 \
|
$MINGW_PACKAGE_PREFIX-lua51 \
|
||||||
$MINGW_PACKAGE_PREFIX-ninja \
|
$MINGW_PACKAGE_PREFIX-ninja \
|
||||||
$MINGW_PACKAGE_PREFIX-rubberband \
|
$MINGW_PACKAGE_PREFIX-rubberband \
|
||||||
|
@ -15,6 +15,12 @@ shallow_clone: true
|
|||||||
test: off
|
test: off
|
||||||
|
|
||||||
install:
|
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
|
# Update core packages
|
||||||
- C:\msys64\usr\bin\pacman -Syyuu --noconfirm --noprogressbar --ask=20
|
- C:\msys64\usr\bin\pacman -Syyuu --noconfirm --noprogressbar --ask=20
|
||||||
# Update non-core packages
|
# Update non-core packages
|
||||||
|
Loading…
Reference in New Issue
Block a user