From 433a54caf91ecae14735eee1484ba3219d202d63 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 18 Jul 2024 08:43:20 +0200 Subject: [PATCH] Revert "CI Linux FFmpeg: add the savoury1 PPA early" The libva in the savoury1 is very new (2.22), which is even newer than in U24.04. This would prevent LD_PRELOAD of libva from the system. This reverts commit 234821d31cd20a6a431c843fc107507e71e04be4. --- .github/scripts/Linux/prepare.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index a5e9d4708..f68238fa0 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -11,10 +11,7 @@ git config --global user.name "UltraGrid Builder" git config --global user.email "ultragrid@example.org" sed -n '/^deb /s/^deb /deb-src /p' /etc/apt/sources.list | sudo tee /etc/apt/sources.list.d/sources.list # for build-dep ffmpeg -# for FFmpeg deps -sudo add-apt-repository ppa:savoury1/ffmpeg4 # openh264, new x265 sudo apt update - sudo apt install appstream `# appstreamcli for mkappimage AppStream validation` \ asciidoc sudo apt install fonts-dejavu-core @@ -51,6 +48,8 @@ sdl2_ttf_build_dep=$(get_build_deps_excl libsdl2-ttf libsdl2-dev) # shellcheck disable=SC2086 # intentional sudo apt install $sdl2_mix_build_dep $sdl2_ttf_build_dep +# FFmpeg deps +sudo add-apt-repository ppa:savoury1/ffmpeg4 # openh264, new x265 # for FFmpeg - libzmq3-dev needs to be ignored (cannot be installed, see run #380) ffmpeg_build_dep=$(get_build_deps_excl ffmpeg 'libzmq3-dev\|libsdl2-dev') # shellcheck disable=SC2086 # intentional