Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
sudo apt update
sudo apt install -y gcc g++ autoconf automake debhelper glslang-dev ladspa-sdk xutils-dev libasound2-dev \
libarchive-dev libbluray-dev libbs2b-dev libcaca-dev libcdio-paranoia-dev libdrm-dev \
libdav1d-dev libdvdnav-dev libegl1-mesa-dev libepoxy-dev libfontconfig-dev libfreetype6-dev \
libdvdnav-dev libegl1-mesa-dev libepoxy-dev libfontconfig-dev libfreetype6-dev \
libfribidi-dev libgl1-mesa-dev libgbm-dev libgme-dev libgsm1-dev libharfbuzz-dev libjpeg-dev \
libbrotli-dev liblcms2-dev libmodplug-dev libmp3lame-dev libopenal-dev \
libopus-dev libopencore-amrnb-dev libopencore-amrwb-dev libpulse-dev librtmp-dev \
Expand Down Expand Up @@ -125,6 +125,7 @@ jobs:
./use-uchardet-master
./use-rubberband-master
./use-libdisplay-info-master
./use-dav1d-custom 1.5.4
./use-ffmpeg-custom n7.1.5
./use-libass-master
./use-libplacebo-custom 4c426e466814536def653cb23f1d1c287ea7a7f5
Expand Down Expand Up @@ -171,6 +172,11 @@ jobs:
grep -q '^#define CONFIG_LIBDAV1D_DECODER 1$' ffmpeg_build/config_components.h
./mpv/build/mpv --no-config --vd=help > /tmp/mpv-video-decoders.txt 2>&1
grep -q libdav1d /tmp/mpv-video-decoders.txt
test -f build_libs/lib/libdav1d.a
if readelf -d mpv/build/libmpv.so.2 | grep -q 'NEEDED.*libdav1d\.so'; then
echo "libmpv.so.2 unexpectedly depends on shared libdav1d"
exit 1
fi

mkdir -p $GITHUB_WORKSPACE/artifacts
cp -r mpv/build/* $GITHUB_WORKSPACE/artifacts
Expand Down
2 changes: 2 additions & 0 deletions external/build
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ scripts/libplacebo-config
scripts/libplacebo-build "$@"
scripts/libass-config
scripts/libass-build "$@"
scripts/dav1d-config
scripts/dav1d-build "$@"
scripts/ffmpeg-config
scripts/ffmpeg-build "$@"
scripts/mpv-config
Expand Down
1 change: 1 addition & 0 deletions external/clean
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ scripts/libxpresent-clean
scripts/libdisplay-info-clean
scripts/libass-clean
scripts/libplacebo-clean
scripts/dav1d-clean
scripts/mpv-clean
rm -rf build_libs
4 changes: 4 additions & 0 deletions external/scripts/dav1d-build
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
set -e

ninja install -C dav1d/build "$@"
3 changes: 3 additions & 0 deletions external/scripts/dav1d-clean
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

rm -rf dav1d/build
30 changes: 30 additions & 0 deletions external/scripts/dav1d-config
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/sh
set -e

BUILD="$(pwd)"
newline="
"

if test -f "$BUILD"/dav1d_options ; then
IFS=$newline
set -- $(cat "$BUILD"/dav1d_options) "$@"
unset -v IFS
fi

OPTIONS="-Ddefault_library=static -Db_staticpic=true -Denable_tools=false -Denable_examples=false -Denable_tests=false -Denable_docs=false"

case "$PKG_CONFIG_PATH" in
'')
export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig"
;;
*)
export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig:$PKG_CONFIG_PATH"
;;
esac

cd "$BUILD"/dav1d

test -d build && OPTIONS="$OPTIONS --wipe"
echo Using dav1d options: $OPTIONS "$@"

meson setup build --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" $OPTIONS "$@"
4 changes: 4 additions & 0 deletions external/update
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ do_clone_all()
do_clone "libdisplay-info" "https://gitlab.freedesktop.org/emersion/libdisplay-info.git"
do_clone "libass" "https://github.com/libass/libass.git"
do_clone "libplacebo" "https://github.com/haasn/libplacebo.git"
do_clone "dav1d" "https://code.videolan.org/videolan/dav1d.git"
do_clone "mpv" "https://github.com/mpv-player/mpv.git"
}

Expand Down Expand Up @@ -113,6 +114,7 @@ checkout_ffmpeg=master
checkout_libdisplay_info=master
checkout_libass=master
checkout_libplacebo=master
checkout_dav1d=master
checkout_mpv=master


Expand All @@ -125,6 +127,7 @@ checkout_all()
checkout libdisplay-info $checkout_libdisplay_info
checkout libass $checkout_libass
checkout libplacebo $checkout_libplacebo
checkout dav1d $checkout_dav1d
checkout mpv $checkout_mpv
}

Expand All @@ -149,6 +152,7 @@ case "$1" in
#checkout_fribidi="master -"
checkout_libass="master -"
checkout_libplacebo="master -"
checkout_dav1d="master -"
checkout_mpv="master -"
;;
--release)
Expand Down
10 changes: 10 additions & 0 deletions external/use-dav1d-custom
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh
set -e
export LC_ALL=C

if [ -z "$1" ]; then
echo "Aborting. Please provide a commit hash or a tag/branch name."
exit 1
fi

scripts/switch-branch dav1d "@$1"
Loading