scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 01:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI FFmpeg Linux: use Git HEAD from cartwheel-ffmpeg

Browse Source 
Patching to master sometimes produces wrong code:

    https://github.com/MartinPulec/UltraGrid/actions/runs/4083831573/jobs/7039818067

The cartwheel submodule is updated reasonably fast so we can keep this
for now.
This commit is contained in:
Martin Pulec
2023-02-03 13:47:01 +01:00
parent 68f462e600
commit db308b1701
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/scripts/Linux/download_build_ffmpeg.sh vendored
View File

@@ -53,8 +53,12 @@ rm -rf /var/tmp/ffmpeg
git clone --depth $FFMPEG_GIT_DEPTH https://git.ffmpeg.org/ffmpeg.git /var/tmp/ffmpeg git clone --depth $FFMPEG_GIT_DEPTH https://git.ffmpeg.org/ffmpeg.git /var/tmp/ffmpeg
cd /var/tmp/ffmpeg cd /var/tmp/ffmpeg
# apply Intel patches # apply Intel patches
git clone https://github.com/intel/cartwheel-ffmpeg.git && git am -3 cartwheel-ffmpeg/patches/* && if [ "$(lsb_release -rs)" = 18.04 ]; then git clone https://github.com/intel/cartwheel-ffmpeg.git
git am -3 $GITHUB_WORKSPACE/.github/scripts/Linux/ffmpeg-patches/0001-removed-bits-incompatible-with-old-vaapi.patch-noauto; fi || exit 1 git checkout "$(GIT_DIR=cartwheel-ffmpeg/.git git submodule status ffmpeg | sed 's/-\([[:xdigit:]]*\).*/\1/')"
git am -3 cartwheel-ffmpeg/patches/*
if [ "$(lsb_release -rs)" = 18.04 ]; then
git am -3 "$GITHUB_WORKSPACE/.github/scripts/Linux/ffmpeg-patches/0001-removed-bits-incompatible-with-old-vaapi.patch-noauto"
fi
install_aom install_aom
( git clone --depth 1 http://git.videolan.org/git/x264.git && cd x264 && ./configure --disable-static --enable-shared && make -j "$(nproc)" && sudo make install || exit 1 ) ( git clone --depth 1 http://git.videolan.org/git/x264.git && cd x264 && ./configure --disable-static --enable-shared && make -j "$(nproc)" && sudo make install || exit 1 )
install_libvpx install_libvpx