Docker: Update build image with final OCIOv2, Qt 5.15.2, OTIO, Crashpad (#1489)

* Add missing xcb-util-* packages. Qt's libqxcb.so seems to require them in the newer Qt version

* Adjust breakpad install prefix to match CMake change

* Add build script for Olive for quick testing

* .n in CI image actually stands for image revision

* skipping the CI is now supported natively by GitHub Actions
This commit is contained in:
Simran
2021-03-25 03:59:42 +01:00
committed by GitHub
parent 2d420decf0
commit cc317a8b1a
16 changed files with 115 additions and 78 deletions
+18 -2
View File
@@ -2,7 +2,7 @@
# Copyright (C) 2020 Olive Team
# SPDX-License-Identifier: GPL-3.0-or-later
# Largely copied from https://trac.ffmpeg.org/wiki/CompilationGuide/Centos
# Largely based on https://trac.ffmpeg.org/wiki/CompilationGuide/Centos
#
# Uses { command } & pattern for parallelism https://gist.github.com/thenadz/6c0584d42fb007582fbc
#
@@ -44,6 +44,21 @@ set -ex
# join jobs, some libs depend on NASM/YASM
wait
# Set up libaom
{
git clone --depth 1 --branch "${AOM_VERSION}" "https://aomedia.googlesource.com/aom"
cd aom
mkdir _build
cd _build
cmake .. \
-DCMAKE_INSTALL_PREFIX="${OLIVE_INSTALL_PREFIX}" \
-DBUILD_SHARED_LIBS=1
cmake --build .
cmake --install .
cd ../..
rm -rf aom
} &
# Set up libx264
{
# TODO: Checkout stable branch instead of master?
@@ -248,12 +263,13 @@ tar xf ffmpeg.tar.xz
cd ffmpeg*
# TODO: --enable-debug?
PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" ./configure \
PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:$PKG_CONFIG_PATH" ./configure \
--disable-doc \
--disable-ffplay \
--enable-gpl \
--enable-version3 \
--enable-shared \
--enable-libaom \
--enable-libfreetype \
--enable-libx264 \
--enable-libx265 \