From c94eb7254f517ccb060ad75bd4d6a59acfd647d1 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 23 Oct 2023 14:41:43 +0200 Subject: [PATCH] Fix Linux build. Update SDK. --- .../linux-desktop-ubuntu-2004.yml | 2 ++ .gitlab-ci-files/linux-desktop.yml | 2 ++ .gitlab-ci.yml | 2 +- docker-files/bc-dev-ubuntu-20-04-lts | 25 ++++++++++--------- external/linphone-sdk | 2 +- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml index fc0ecd7ec..2e4609686 100644 --- a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml +++ b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml @@ -81,6 +81,8 @@ ubuntu2004-makefile-gcc: - echo $CMAKE_SANITIZER_OPTIONS - eval "$(qtchooser -qt=$QT_LINUX_VER -print-env)" - export PATH=${QTTOOLDIR}:$PATH + - export Qt6_DIR=${QTLIBDIR}/cmake/Qt6 + - echo "Using Qt $QT_LINUX_VER at ${QTLIBDIR}" - cd build - cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS - cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS diff --git a/.gitlab-ci-files/linux-desktop.yml b/.gitlab-ci-files/linux-desktop.yml index 2eb4f9db3..78d8f6895 100644 --- a/.gitlab-ci-files/linux-desktop.yml +++ b/.gitlab-ci-files/linux-desktop.yml @@ -14,6 +14,8 @@ cd build eval "$(qtchooser -qt=$QT_LINUX_VER -print-env)" export PATH=${QTTOOLDIR}:$PATH + export Qt6_DIR=${QTLIBDIR}/cmake/Qt6 + echo "Using Qt $QT_LINUX_VER at ${QTLIBDIR}" cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21b6ba602..cff4a2ad2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: DEBIAN_9_QT_IMAGE_VERSION: 20230417_qtopen_gstreamer DEBIAN_10_IMAGE_VERSION: 20210217_python3 UBUNTU_ROLLING_IMAGE_VERSION: 20211012_add_qtwebview - UBUNTU_2004_IMAGE_VERSION: 20231013_init + UBUNTU_2004_IMAGE_VERSION: 20231024_add_multimedia workflow: diff --git a/docker-files/bc-dev-ubuntu-20-04-lts b/docker-files/bc-dev-ubuntu-20-04-lts index 391561a72..c728bb513 100644 --- a/docker-files/bc-dev-ubuntu-20-04-lts +++ b/docker-files/bc-dev-ubuntu-20-04-lts @@ -1,5 +1,5 @@ ############################################################################### -# Dockerfile used to make gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu-20-04-lts:20231004 +# Dockerfile used to make gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-ubuntu-20-04-lts:20231024_add_multimedia ############################################################################### FROM ubuntu:20.04 @@ -7,16 +7,18 @@ FROM ubuntu:20.04 # Qt on Ubuntu 20.04 is too old. Use a downloader. ARG QT_VERSION=5.15.2 ARG QT6_VERSION=6.5.3 -ARG QT_MODULES=qtwebengine qtnetworkauth qtquick3d +#Do not use it. It seems that it cannot be used from python command. +#ARG QT_MODULES=qtnetworkauth qtquick3d qtmultimedia MAINTAINER Julien Wadel -# Use a french mirror -RUN sed -i -E 's/(archive|security)\.ubuntu\.com/fr.archive.ubuntu.com/' /etc/apt/sources.list +# Use a Swiss mirror +RUN sed -i -E 's/(archive|security)\.ubuntu\.com/ch.archive.ubuntu.com/' /etc/apt/sources.list # add fallbacks for timeout connections. -#Swiss -RUN echo "deb http://ch.archive.ubuntu.com/ubuntu/ bionic main restricted" >> /etc/apt/sources.list + +#France +RUN echo "deb http://fr.archive.ubuntu.com/ubuntu/ bionic main restricted" >> /etc/apt/sources.list RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main restricted" >> /etc/apt/sources.list RUN echo "deb http://ch.archive.ubuntu.com/ubuntu/ bionic-updates main restricted" >> /etc/apt/sources.list #Belgium @@ -93,17 +95,16 @@ RUN sudo pip3 install --upgrade setuptools RUN sudo pip3 install ez_setup ## Install Qt download tool +# installation is split because there is a way where some modules are not downloaded in the first attempt. RUN sudo pip3 install py7zr aqtinstall -RUN sudo python3 -m aqt install $QT_VERSION linux desktop -O /opt/Qt -m $QT_MODULES -RUN sudo python3 -m aqt install $QT6_VERSION linux desktop -O /opt/Qt -m $QT_MODULES +RUN sudo python3 -m aqt install-qt linux desktop $QT_VERSION -O /opt/Qt +RUN sudo python3 -m aqt install-qt linux desktop $QT_VERSION -O /opt/Qt --noarchives -m qtnetworkauth qtquick3d +RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt +RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt --noarchives -m qtnetworkauth qtquick3d qtmultimedia RUN sudo chown -R bc:bc /opt/Qt/ RUN qtchooser -install $QT_VERSION /opt/Qt/$QT_VERSION/gcc_64/bin/qmake RUN qtchooser -install $QT6_VERSION /opt/Qt/$QT6_VERSION/gcc_64/bin/qmake -RUN eval "$(qtchooser -qt=$QT_VERSION -print-env)" -ENV Qt5_DIR=${QTLIBDIR}/cmake/Qt5 -ENV PATH=${QTTOOLDIR}:$PATH - CMD bash diff --git a/external/linphone-sdk b/external/linphone-sdk index eed7c5254..8756a37ad 160000 --- a/external/linphone-sdk +++ b/external/linphone-sdk @@ -1 +1 @@ -Subproject commit eed7c5254e2b774840f7a2d4b0d5b39ab0624190 +Subproject commit 8756a37ad10399a0c27d32590a0d1cc87ea97c2e