diff --git a/buildscripts/build.sh b/buildscripts/build.sh index 0c661f7..eccdcfb 100755 --- a/buildscripts/build.sh +++ b/buildscripts/build.sh @@ -80,7 +80,7 @@ cpp = '$CXX' ar = 'llvm-ar' nm = 'llvm-nm' strip = 'llvm-strip' -pkgconfig = 'pkg-config' +pkg-config = 'pkg-config' [host_machine] system = 'android' cpu_family = '$cpu_family' diff --git a/buildscripts/include/depinfo.sh b/buildscripts/include/depinfo.sh index 5107fff..38c63d7 100755 --- a/buildscripts/include/depinfo.sh +++ b/buildscripts/include/depinfo.sh @@ -12,9 +12,10 @@ v_harfbuzz=8.3.0 v_fribidi=1.0.13 v_freetype=2-13-2 v_mbedtls=3.5.1 +v_libplacebo=6.338.1 v_dav1d=1.3.0 v_ffmpeg=6.1 -v_mpv=0.36.0 +v_mpv=0.37.0 ## Dependency tree @@ -29,6 +30,6 @@ dep_harfbuzz=() dep_libass=(freetype fribidi harfbuzz) dep_lua=() dep_libplacebo=() -dep_mpv=(ffmpeg libass lua) +dep_mpv=(ffmpeg libass lua libplacebo) dep_mpv_android=(mpv) diff --git a/buildscripts/include/download-deps.sh b/buildscripts/include/download-deps.sh index 58d7aec..b38c717 100755 --- a/buildscripts/include/download-deps.sh +++ b/buildscripts/include/download-deps.sh @@ -34,6 +34,8 @@ if [ ! -d lua ]; then tar -xz -C lua --strip-components=1 fi +[ ! -d libplacebo ] && git clone --depth 1 --branch v$v_libplacebo --recursive https://code.videolan.org/videolan/libplacebo.git libplacebo + # mpv [ ! -d mpv ] && git clone --depth 1 --branch v$v_mpv https://github.com/mpv-player/mpv.git mpv diff --git a/buildscripts/patches/mpv/mpv_restore_default_sub_selection_behavior.patch b/buildscripts/patches/mpv/mpv_restore_default_sub_selection_behavior.patch deleted file mode 100644 index 9e05339..0000000 --- a/buildscripts/patches/mpv/mpv_restore_default_sub_selection_behavior.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/options/options.c b/options/options.c -index 86e5a7b..7dc5d09 100644 ---- a/options/options.c -+++ b/options/options.c -@@ -1040,7 +1040,8 @@ static const struct MPOpts mp_default_opts = { - [STREAM_SUB] = (char *[]){ "auto", NULL }, - }, - .stream_auto_sel = true, -- .subs_with_matching_audio = false, -+ .subs_with_matching_audio = true, -+ .subs_fallback = 1, - .subs_fallback_forced = true, - .audio_display = 1, - .audio_output_format = 0, // AF_FORMAT_UNKNOWN diff --git a/buildscripts/scripts/libplacebo.sh b/buildscripts/scripts/libplacebo.sh new file mode 100755 index 0000000..26e55d4 --- /dev/null +++ b/buildscripts/scripts/libplacebo.sh @@ -0,0 +1,26 @@ +#!/bin/bash -e + +. ../../include/depinfo.sh +. ../../include/path.sh + +build=_build$ndk_suffix + +if [ "$1" == "build" ]; then + true +elif [ "$1" == "clean" ]; then + rm -rf $build + exit 0 +else + exit 255 +fi + +unset CC CXX +meson setup $build --cross-file "$prefix_dir"/crossfile.txt \ + -Dvulkan=disabled -Ddemos=false + +ninja -C $build -j$cores +DESTDIR="$prefix_dir" ninja -C $build install + +# add missing library for static linking +# this isn't "-lstdc++" due to a meson bug: https://github.com/mesonbuild/meson/issues/11300 +${SED:-sed} '/^Libs:/ s|$| -lc++|' "$prefix_dir/lib/pkgconfig/libplacebo.pc" -i