Skip to content

Commit

Permalink
build: update mpv to 0.37 and add libplacebo
Browse files Browse the repository at this point in the history
mpv 0.36.0 -> 0.37.0
libplacebo null -> 6.338.1

Also remove patch to restore mpv default sub selection behavior
  • Loading branch information
jarnedemeulemeester committed Nov 23, 2023
1 parent fc7de4a commit be46a78
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 17 deletions.
2 changes: 1 addition & 1 deletion buildscripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions buildscripts/include/depinfo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

2 changes: 2 additions & 0 deletions buildscripts/include/download-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

This file was deleted.

26 changes: 26 additions & 0 deletions buildscripts/scripts/libplacebo.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit be46a78

Please sign in to comment.