1
0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-04-20 10:17:07 +02:00

CI: Update Ubuntu setup/build scripts with 24.04 baseline

- Removes check for 22.10 as 24.04 is now the minimum
- Moves librist and libsrt to default dependencies
- Adds nv-codec-headers for native NVENC
This commit is contained in:
derrod
2024-08-18 03:21:13 +02:00
committed by Ryan Foster
parent 154f0b549d
commit 419c1e4bc1
3 changed files with 2 additions and 11 deletions

View File

@@ -216,7 +216,6 @@ build() {
-DCEF_ROOT_DIR:PATH="${project_root}/.deps/cef_binary_${CEF_VERSION}_${target//ubuntu-/linux_}"
)
if (( ! UBUNTU_2210_OR_LATER )) cmake_args+=(-DENABLE_NEW_MPEGTS_OUTPUT:BOOL=OFF)
if [[ ${target##*-} == aarch64 ]] cmake-args+=(-DENABLE_QSV11:BOOL=OFF)
cmake_build_args+=(build_${target%%-*} --config ${config} --parallel)

View File

@@ -3,8 +3,6 @@ autoload -Uz log_debug log_group
log_group 'Check Ubuntu build requirements'
log_debug 'Checking Ubuntu distribution name and version...'
# Check for Ubuntu version 22.10 or later, which have srt and librist available via apt-get
typeset -g -i UBUNTU_2210_OR_LATER=0
if [[ -f /etc/os-release ]] {
local dist_name
local dist_version
@@ -15,11 +13,6 @@ if [[ -f /etc/os-release ]] {
log_group
return 2
}
autoload -Uz is-at-least
if is-at-least 22.10 ${dist_version}; then
typeset -g -i UBUNTU_2210_OR_LATER=1
fi
} else {
log_error "Unable to determine local Linux distribution, but Ubuntu is required. Aborting"
log_group

View File

@@ -101,12 +101,11 @@ sudo apt-get install -y --no-install-recommends \
libasound2-dev libfdk-aac-dev libfontconfig-dev libfreetype6-dev libjack-jackd2-dev \
libpulse-dev libsndio-dev libspeexdsp-dev libudev-dev libv4l-dev libva-dev libvlc-dev \
libpci-dev libdrm-dev \
nlohmann-json3-dev libwebsocketpp-dev libasio-dev libqrcodegencpp-dev
nlohmann-json3-dev libwebsocketpp-dev libasio-dev libqrcodegencpp-dev \
libffmpeg-nvenc-dev librist-dev libsrt-openssl-dev
if [[ ${target##*-} == x86_64 ]] sudo apt-get install -y --no-install-recommends libvpl-dev libvpl2
if (( UBUNTU_2210_OR_LATER )) sudo apt-get install -y --no-install-recommends librist-dev libsrt-openssl-dev
local -a _qt_packages=()
if (( QT_VERSION == 6 )) {