mirror of https://github.com/mpv-player/mpv
Revert "ci/msys2: disable some features for 32-bit build"
No longer needed after232919336d
. This reverts commit883a45fa3e
.
This commit is contained in:
parent
51c613bbcd
commit
28bc58a3e8
|
@ -527,6 +527,7 @@ jobs:
|
||||||
lcms2:p
|
lcms2:p
|
||||||
libarchive:p
|
libarchive:p
|
||||||
libass:p
|
libass:p
|
||||||
|
libcdio-paranoia:p
|
||||||
libdvdnav:p
|
libdvdnav:p
|
||||||
libjpeg-turbo:p
|
libjpeg-turbo:p
|
||||||
libplacebo:p
|
libplacebo:p
|
||||||
|
@ -537,13 +538,14 @@ jobs:
|
||||||
python:p
|
python:p
|
||||||
shaderc:p
|
shaderc:p
|
||||||
spirv-cross:p
|
spirv-cross:p
|
||||||
|
uchardet:p
|
||||||
|
vapoursynth:p
|
||||||
vulkan-devel:p
|
vulkan-devel:p
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
if: ${{ matrix.sys != 'mingw32' }}
|
if: ${{ matrix.sys != 'mingw32' }}
|
||||||
run: |
|
run: |
|
||||||
pacboy --noconfirm -S angleproject cppwinrt libcdio-paranoia rst2pdf \
|
pacboy --noconfirm -S {angleproject,cppwinrt,rst2pdf,rubberband}:p
|
||||||
rubberband uchardet vapoursynth
|
|
||||||
|
|
||||||
- name: Build with meson
|
- name: Build with meson
|
||||||
id: build
|
id: build
|
||||||
|
|
|
@ -3,14 +3,13 @@
|
||||||
args=(
|
args=(
|
||||||
--werror
|
--werror
|
||||||
-Dc_args='-Wno-error=deprecated -Wno-error=deprecated-declarations'
|
-Dc_args='-Wno-error=deprecated -Wno-error=deprecated-declarations'
|
||||||
-D{d3d-hwaccel,d3d11,dvdnav,jpeg,lcms2,libarchive}=enabled
|
-D{cdda,d3d-hwaccel,d3d11,dvdnav,jpeg,lcms2,libarchive}=enabled
|
||||||
-D{libbluray,lua,shaderc,spirv-cross}=enabled
|
-D{libbluray,lua,shaderc,spirv-cross,uchardet,vapoursynth}=enabled
|
||||||
-D{libmpv,tests}=true
|
-D{libmpv,tests}=true
|
||||||
)
|
)
|
||||||
|
|
||||||
[[ "$SYS" != "clang32" && "$SYS" != "mingw32" ]] && args+=(
|
[[ "$SYS" != "clang32" && "$SYS" != "mingw32" ]] && args+=(
|
||||||
-D{cdda,egl-angle-lib,egl-angle-win32,pdf-build}=enabled
|
-D{egl-angle-lib,egl-angle-win32,pdf-build,rubberband,win32-smtc}=enabled
|
||||||
-D{rubberband,uchardet,vapoursynth,win32-smtc}=enabled
|
|
||||||
)
|
)
|
||||||
|
|
||||||
meson setup build "${args[@]}"
|
meson setup build "${args[@]}"
|
||||||
|
|
Loading…
Reference in New Issue