Skip to content

Commit

Permalink
GitHub CI [Linux]: use cmake for build/install instead of make
Browse files Browse the repository at this point in the history
To avoid rebuilds when reloaded from cache.
  • Loading branch information
MartinPulec committed Mar 3, 2021
1 parent f7676cc commit f7bf7e9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/Linux/download_build_ffmpeg.sh
Expand Up @@ -17,7 +17,7 @@ cd /var/tmp/ffmpeg
sed -i '1,/sliceModeData = 1;/s/sliceModeData = 1;/sliceModeData = 8;/' libavcodec/nvenc.c # only first occurence - for H.264, not HEVC
( git clone --depth 1 -b nasm-2.13.xx https://github.com/sezero/nasm.git && cd nasm && ./autogen.sh && ./configure && make nasm.1 && make ndisasm.1 && 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 )
( git clone --depth 1 https://aomedia.googlesource.com/aom && mkdir -p aom/build && cd aom/build && cmake -DBUILD_SHARED_LIBS=1 .. && make -j $(nproc) && sudo make install || exit 1 )
( git clone --depth 1 https://aomedia.googlesource.com/aom && mkdir -p aom/build && cd aom/build && cmake -DBUILD_SHARED_LIBS=1 .. && cmake --build . --parallel && sudo cmake --install . || exit 1 )
install_nv_codec_headers
install_svt
./configure --disable-static --enable-shared --enable-gpl --enable-libx264 --enable-libx265 --enable-libopus --enable-nonfree --enable-nvenc --enable-libaom --enable-libvpx --enable-libspeex --enable-libmp3lame --enable-libsvthevc --enable-libsvtav1
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/Linux/install_ffmpeg.sh
Expand Up @@ -4,7 +4,7 @@ cd /var/tmp/ffmpeg
( cd nasm && sudo make install )
( cd x264 && sudo make install )
( cd nv-codec-headers && sudo make install )
( cd aom/build && sudo make install )
( cd aom/build && sudo cmake --install . )
( cd SVT-HEVC/Build/linux/Release && sudo make install )
( cd SVT-AV1/Build && sudo make install )
sudo make install
Expand Down

0 comments on commit f7bf7e9

Please sign in to comment.