opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CI: Use Qt6 by default when available

Browse Source
This commit is contained in:
Ryan Foster
2022-07-31 13:45:57 -04:00
parent f1cf3ff141
commit b4e056f39d
5 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CI/linux/01_install_dependencies.sh
+16 -4
View File
@@ -32,14 +32,25 @@ install_obs-deps() {
fi
}
install_qt-deps() {
install_qt5-deps() {
shift
status "Install Qt dependencies"
trap "caught_error 'install_qt-deps'" ERR
status "Install Qt5 dependencies"
trap "caught_error 'install_qt5-deps'" ERR
sudo apt-get install -y $@
}
install_qt6-deps() {
shift
status "Install Qt6 dependencies"
trap "caught_error 'install_qt6-deps'" ERR
_QT6_AVAILABLE="$(sudo apt-cache madison ${1})"
if [ "${_QT6_AVAILABLE}" ]; then
sudo apt-get install -y $@
fi
}
install_cef() {
shift
status "Setup for dependency CEF v${1}"
@@ -80,7 +91,8 @@ install_dependencies() {
libluajit-5.1-dev python3-dev libx11-dev libxcb-randr0-dev libxcb-shm0-dev libxcb-xinerama0-dev \
libxcb-composite0-dev libxinerama-dev libxcb1-dev libx11-xcb-dev libxcb-xfixes0-dev swig libcmocka-dev \
libpci-dev libxss-dev libglvnd-dev libgles2-mesa libgles2-mesa-dev libwayland-dev libxkbcommon-dev"
"qt-deps qtbase5-dev qtbase5-private-dev libqt5svg5-dev qtwayland5"
"qt5-deps qtbase5-dev qtbase5-private-dev libqt5svg5-dev qtwayland5"
"qt6-deps qt6-base-dev qt6-base-private-dev libqt6svg6-dev qt6-wayland"
"cef ${LINUX_CEF_BUILD_VERSION:-${CI_LINUX_CEF_VERSION}}"
"plugin-deps libasound2-dev libfdk-aac-dev libfontconfig-dev libfreetype6-dev libjack-jackd2-dev \
libpulse-dev libsndio-dev libspeexdsp-dev libudev-dev libv4l-dev libva-dev libvlc-dev libdrm-dev"