Skip to content

Commit 2eaf9bc

Browse files
committed
CI Linux: removed obsolete commands
1 parent fb022f2 commit 2eaf9bc

File tree

1 file changed

+1
-27
lines changed

1 file changed

+1
-27
lines changed

.github/scripts/Linux/prepare.sh

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,38 +33,12 @@ sudo apt install libasound-dev libcaca-dev libjack-jackd2-dev libnatpmp-dev libv
3333
sudo apt install libopencv-core-dev libopencv-imgproc-dev
3434
sudo apt install libcurl4-openssl-dev # for RTSP client (vidcap)
3535
sudo apt install i965-va-driver-shaders libva-dev # instead of i965-va-driver
36-
sudo apt-mark hold libva2
37-
sudo apt install uuid-dev # Cineform
38-
39-
(
40-
. /etc/os-release
41-
if [ "$ID" != ubuntu ] || [ "$VERSION_ID" != 20.04 ]; then
42-
exit
43-
fi
44-
sudo apt install gcc-10 g++-10
45-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10
46-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
47-
48-
# FFmpeg deps
49-
for i in $(seq 10); do
50-
[ "$i" -gt 1 ] && sleep $((2**i))
51-
# openh264, new x265
52-
sudo add-apt-repository --yes ppa:savoury1/ffmpeg4 && err=0 && break || err=$?
53-
done
54-
(exit "$err")
55-
)
5636

5737
get_build_deps_excl() { # $2 - pattern to exclude; separate packates with '\|' (BRE alternation)
5838
apt-cache showsrc "$1" | sed -n '/^Build-Depends:/{s/Build-Depends://;p;q}' | tr ',' '\n' | cut -f 2 -d\ | grep -v "$2"
5939
}
60-
sudo apt build-dep libsdl2
61-
sdl2_mix_build_dep=$(get_build_deps_excl libsdl2-mixer libsdl2-dev)
62-
sdl2_ttf_build_dep=$(get_build_deps_excl libsdl2-ttf libsdl2-dev)
63-
# shellcheck disable=SC2086 # intentional
64-
sudo apt install $sdl2_mix_build_dep $sdl2_ttf_build_dep
6540

66-
# for FFmpeg - libzmq3-dev needs to be ignored (cannot be installed, see run #380)
67-
ffmpeg_build_dep=$(get_build_deps_excl ffmpeg 'libva-dev')
41+
ffmpeg_build_dep=$(get_build_deps_excl ffmpeg 'nonexistent-placeholder')
6842
# shellcheck disable=SC2086 # intentional
6943
sudo apt install $ffmpeg_build_dep libdav1d-dev libde265-dev \
7044
libopenh264-dev libvulkan-dev

0 commit comments

Comments
 (0)