diff --git a/.github/scripts/.build.zsh b/.github/scripts/.build.zsh index 4746caa19..91c93d8db 100755 --- a/.github/scripts/.build.zsh +++ b/.github/scripts/.build.zsh @@ -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) diff --git a/.github/scripts/utils.zsh/check_ubuntu b/.github/scripts/utils.zsh/check_ubuntu index bb6509cf7..ddb9ee5de 100644 --- a/.github/scripts/utils.zsh/check_ubuntu +++ b/.github/scripts/utils.zsh/check_ubuntu @@ -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 diff --git a/.github/scripts/utils.zsh/setup_ubuntu b/.github/scripts/utils.zsh/setup_ubuntu index 12ce107b4..0809db17e 100644 --- a/.github/scripts/utils.zsh/setup_ubuntu +++ b/.github/scripts/utils.zsh/setup_ubuntu @@ -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 )) {