From da7873b85624096a9ea8c500a4e693e7a7cda5c3 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 19 Jun 2025 14:44:33 +0200 Subject: [PATCH] Revert "CI Linux FFmpeg: apply cartwheel patches" This reverts commit a30a8945e33c085ba7ba8685734349afd134c119. This doesn't seem to be required anymore (at least xv30 and yuvx work with Arc A770 and Raptor Lake-P GPU on i7-1355U). As the patches need to be applied against specific version of FFmpeg (pinned in db308b17 2023-02-03). Currently the version is from 23th Dec 2024, which is slightly old. That is a half of the year but we also depend on the cartwheel version bump, which is a bit unfortunate, whereas is now not cerain, if there is something needed. --- .github/scripts/Linux/download_build_ffmpeg.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh index 84cf32cd1..85ff9f108 100755 --- a/.github/scripts/Linux/download_build_ffmpeg.sh +++ b/.github/scripts/Linux/download_build_ffmpeg.sh @@ -51,10 +51,6 @@ install_onevpl() {( rm -rf /var/tmp/ffmpeg git clone --depth $FFMPEG_GIT_DEPTH https://git.ffmpeg.org/ffmpeg.git /var/tmp/ffmpeg cd /var/tmp/ffmpeg -# apply Intel patches -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