Skip to content

Commit 35e30cd

Browse files
committed
CI Linux: install pipewire with distro pkg
+ remove explicit libdav1d install (already in FFmpeg build-dep)
1 parent 1abc9d9 commit 35e30cd

File tree

2 files changed

+3
-20
lines changed

2 files changed

+3
-20
lines changed

.github/scripts/Linux/install_others.sh

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,6 @@ install_ndi() {(
3636
sudo cp -r NDI\ SDK\ for\ Linux/include/* /usr/local/include/
3737
)}
3838

39-
# TODO: needed only for U20.04, remove after upgrading to U22.04
40-
install_pipewire() {(
41-
if { [ "$ID" = ubuntu ] && [ "$VERSION_ID" = 20.04 ]; } ||
42-
{ [ "${ID_LIKE-$ID}" = debian ] && [ "$VERSION_ID" -le 11 ]; }
43-
then
44-
sudo apt -y install libdbus-1-dev meson
45-
git clone https://github.com/PipeWire/pipewire
46-
cd pipewire
47-
git checkout 19bcdaebe29b95edae2b285781dab1cc841be638 # last one supporting meson 0.53.2 in U20.04
48-
./autogen.sh -Dtests=disabled
49-
make -j "$(nproc)"
50-
sudo make install
51-
else
52-
sudo apt -y install libpipewire-0.3-dev
53-
fi
54-
)}
55-
5639
install_rav1e() {(
5740
# TODO: use avx2 later
5841
if expr "${UG_ARCH-}" : '.*avx' >/dev/null; then
@@ -90,7 +73,7 @@ if [ $# -eq 1 ] && { [ "$1" = -h ] || [ "$1" = --help ] || [ "$1" = help ]; }; t
9073
fi
9174

9275
if [ $# -eq 0 ] || [ $show_help ]; then
93-
set -- gpujpeg ndi pipewire rav1e vulkan ximea
76+
set -- gpujpeg ndi rav1e vulkan ximea
9477
fi
9578

9679
if [ $show_help ]; then

.github/scripts/Linux/prepare.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ sudo apt --no-install-recommends install nvidia-cuda-toolkit
2626
sudo apt install libglew-dev libglfw3-dev
2727
sudo apt install libglm-dev
2828
sudo apt install libmagickwand-dev
29+
sudo apt install libpipewire-0.3-dev
2930
sudo apt install libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev
3031
sudo apt install libsoxr-dev libspeexdsp-dev
3132
sudo apt install libssl-dev
@@ -40,8 +41,7 @@ get_build_deps_excl() { # $2 - pattern to exclude; separate packates with '\|' (
4041

4142
ffmpeg_build_dep=$(get_build_deps_excl ffmpeg 'nonexistent-placeholder')
4243
# shellcheck disable=SC2086 # intentional
43-
sudo apt install $ffmpeg_build_dep libdav1d-dev libde265-dev \
44-
libopenh264-dev libvulkan-dev
44+
sudo apt install $ffmpeg_build_dep libde265-dev libopenh264-dev
4545
sudo apt-get -y remove 'libavcodec*' 'libavutil*' 'libswscale*' libvpx-dev nginx
4646

4747
sudo apt install qtbase5-dev

0 commit comments

Comments
 (0)