CI: remove U20.04 compat

+ update TODO for pipewire where still neeeded for Debian 11
This commit is contained in:
Martin Pulec
2025-03-26 16:39:08 +01:00
parent 5d3c9f9e06
commit 5bd65911cd
3 changed files with 2 additions and 40 deletions

View File

@@ -56,9 +56,6 @@ cd /var/tmp/ffmpeg
git clone https://github.com/intel/cartwheel-ffmpeg.git
git checkout "$(GIT_DIR=cartwheel-ffmpeg/.git git submodule status ffmpeg | sed 's/-\([[:xdigit:]]*\).*/\1/')"
git am -3 cartwheel-ffmpeg/patches/*
if [ "$(lsb_release -rs)" = 20.04 ]; then
git am -3 "$GITHUB_WORKSPACE/.github/scripts/Linux/ffmpeg-patches/0001-removed-bits-incompatible-with-old-vaapi.patch-noauto"
fi
install_aom
install_libvpx
install_nv_codec_headers

View File

@@ -1,36 +0,0 @@
From 2e211a6d63db7a4c9232cfd9dc60553c563d6c64 Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Wed, 16 Oct 2024 09:10:12 +0200
Subject: [PATCH] removed bits incompatible with old vaapi
---
libavcodec/vaapi_encode_h265.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
index bb1944c505..e84c27611c 100644
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@@ -393,9 +393,6 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx)
.vui_parameters_present_flag = 0,
- .scc_fields.bits = {
- .palette_mode_enabled_flag = sps->palette_mode_enabled_flag,
- }
};
*vpic = (VAEncPictureParameterBufferHEVC) {
@@ -448,9 +445,6 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx)
.enable_gpu_weighted_prediction = 0,
.no_output_of_prior_pics_flag = 0,
},
- .scc_fields.bits = {
- .pps_curr_pic_ref_enabled_flag = pps->pps_curr_pic_ref_enabled_flag,
- }
};
if (pps->tiles_enabled_flag) {
--
2.47.0

View File

@@ -35,7 +35,8 @@ install_ndi() {(
sudo cp -r NDI\ SDK\ for\ Linux/include/* /usr/local/include/
)}
# TODO: needed only for U20.04, remove after upgrading to U22.04
# TODO: currently needed for Debian 11, which is used for ARM builds
# remove when not needed
install_pipewire() {(
if { [ "$ID" = ubuntu ] && [ "$VERSION_ID" = 20.04 ]; } ||
{ [ "${ID_LIKE-$ID}" = debian ] && [ "$VERSION_ID" -le 11 ]; }