small changes and disable libass until it is ready

This commit is contained in:
2026-01-23 16:39:19 -06:00
parent c1d4617145
commit 6d709cb279
4 changed files with 7 additions and 3 deletions

5
Jenkinsfile vendored
View File

@@ -15,6 +15,7 @@ pipeline {
agent none agent none
environment { environment {
DEBUG = "1" DEBUG = "1"
HEADLESS = "1"
} }
options { buildDiscarder logRotator(numToKeepStr: '4') } options { buildDiscarder logRotator(numToKeepStr: '4') }
stages { stages {
@@ -40,7 +41,7 @@ pipeline {
axes { axes {
axis { axis {
name 'COMP_OPTS'; name 'COMP_OPTS';
values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF STATIC=ON', 'OPT=3 LTO=ON STATIC=ON PGO=ON' values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON'
} }
} }
stages { stages {
@@ -61,7 +62,7 @@ pipeline {
axis { name 'DISTRO'; values 'ubuntu', 'fedora', 'debian', 'archlinux' } axis { name 'DISTRO'; values 'ubuntu', 'fedora', 'debian', 'archlinux' }
axis { axis {
name 'COMP_OPTS'; name 'COMP_OPTS';
values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF STATIC=ON', 'OPT=3 LTO=ON STATIC=ON PGO=ON' values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON'
} }
} }
stages { stages {

View File

@@ -357,6 +357,9 @@ spinner() {
start) start)
test -f "${spinPidFile}" && rm "${spinPidFile}" test -f "${spinPidFile}" && rm "${spinPidFile}"
# don't want to clutter logs if running headless
test "${HEADLESS}" == '1' && return
_start_spinner & _start_spinner &
echo $! >"${spinPidFile}" echo $! >"${spinPidFile}"
;; ;;

View File

@@ -41,7 +41,6 @@ libx264 \
libx265 \ libx265 \
libwebp \ libwebp \
libvpx \ libvpx \
libass \
libvorbis \ libvorbis \
libmp3lame\ libmp3lame\
" "

View File

@@ -19,6 +19,7 @@ set_docker_run_flags() {
-v "${REPO_DIR}:${REPO_DIR}" -v "${REPO_DIR}:${REPO_DIR}"
-w "${REPO_DIR}" -w "${REPO_DIR}"
-e "DEBUG=${DEBUG}" -e "DEBUG=${DEBUG}"
-e "HEADLESS=${HEADLESS}"
-t -t
) )
for opt in "${FB_COMP_OPTS[@]}"; do for opt in "${FB_COMP_OPTS[@]}"; do