submodules: update nightly branch

Makefile.packaging

@@ -106,6 +106,8 @@ package-all: package-debian_9 \
              package-ubuntu_19.10_i386_oci \
              package-ubuntu_20.04 \
              package-ubuntu_20.04_oci \
+             package-ubuntu_20.10 \
+             package-ubuntu_20.10_oci \
              package-fedora_31 \
              package-fedora_31_i386 \
              package-fedora_32 \

client-gnome @ ca5e02b7

-Subproject commit 84a558b930be30866e05f618bd952a5a138f852a
+Subproject commit ca5e02b739c5287aeaf8fe3ccfe31afc285e46b9

daemon @ 00330fd8

-Subproject commit c9670a0ef3a91361432864fee8c5db5ceeff49e2
+Subproject commit 00330fd841f0cef6d178d5c12c7a7ffa0edf2a78

docker/Dockerfile_raspbian_10_armhf

-FROM arm32v7/debian:buster
-# debian because no raspbian imgs
-
-# FIXME: dirty qemu-static hack required because our Jenkins node runs Docker 17
-# Remove next line as soon as we get Docker 18 +
-COPY qemu-static/qemu-arm-static /usr/bin/qemu-arm-static
+FROM debian:buster
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y vim devscripts
+# Add armhf dpkg architecture and add cross-compiling toolchain and
+# tools
+RUN dpkg --add-architecture armhf
+
+RUN apt-get clean && \
+    apt update && \
+    apt install -y \
+        devscripts \
+        gcc-8-arm-linux-gnueabihf-base \
+        gcc-arm-linux-gnueabihf \
+        binutils-arm-linux-gnueabihf \
+        g++-arm-linux-gnueabihf \
+        cpp-arm-linux-gnueabihf \
+        binutils-arm-linux-gnueabihf-dbg \
+        crossbuild-essential-armhf \
+        build-essential && \
+    rm -rf /var/lib/apt/lists/*
 
 # Speed up mk-build-deps
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y -o Acquire::Retires=10 \
+RUN apt update && \
+    apt install -y -o Acquire::Retries=3 \
         git \
         autoconf \
         automake \
@@ -25,9 +33,9 @@ RUN apt-get update && \
         libdbus-1-dev \
         libdbus-c++-dev \
         libargon2-0-dev \
-        libcanberra-gtk3-dev \
-        libclutter-gtk-1.0-dev \
-        libclutter-1.0-dev \
+        libcanberra-gtk3-dev:armhf \
+        libclutter-gtk-1.0-dev:armhf \
+        libclutter-1.0-dev:armhf \
         libglib2.0-dev \
         libgtk-3-dev \
         libnotify-dev \
@@ -66,7 +74,8 @@ RUN apt-get update && \
         libcrypto++-dev \
         libva-dev \
         libvdpau-dev \
-        libssl-dev
+        libssl-dev:armhf && \
+    rm -rf /var/lib/apt/lists/*
 
 ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
 

docker/Dockerfile_ubuntu_20.10

+FROM ubuntu:20.10
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y devscripts equivs
+
+# Speed up mk-build-deps
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y -o Acquire::Retries=3 \
+        git \
+        autoconf \
+        automake \
+        autopoint \
+        cmake \
+        libtool \
+        libdbus-1-dev \
+        libdbus-c++-dev \
+        libgnutls28-dev \
+        libargon2-0-dev \
+        libcanberra-gtk3-dev \
+        libclutter-gtk-1.0-dev \
+        libclutter-1.0-dev \
+        libglib2.0-dev \
+        libgtk-3-dev \
+        libnotify-dev \
+        qtbase5-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
+        yasm \
+        nasm \
+        autotools-dev \
+        gettext \
+        libpulse-dev \
+        libasound2-dev \
+        libexpat1-dev \
+        libpcre3-dev \
+        libyaml-cpp-dev \
+        libboost-dev \
+        libxext-dev \
+        libxfixes-dev \
+        libspeex-dev \
+        libspeexdsp-dev \
+        uuid-dev \
+        libavcodec-dev \
+        libavutil-dev \
+        libavformat-dev \
+        libswscale-dev \
+        libavdevice-dev \
+        libopus-dev \
+        libudev-dev \
+        libgsm1-dev \
+        libjsoncpp-dev \
+        libmsgpack-dev \
+        libnatpmp-dev \
+        libayatana-appindicator3-dev \
+        libqrencode-dev \
+        libnm-dev \
+        libwebkit2gtk-4.0-dev \
+        libcrypto++-dev \
+        libva-dev \
+        libvdpau-dev \
+        libssl-dev
+
+ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
+
+CMD /opt/build-package-debian.sh

lrc @ a9f833f1

-Subproject commit ecca4dc2fd3ec90db66feaba4c18d758dc4dd460
+Subproject commit a9f833f16aacf50e0768a172210e76ea1f38d95a

make-ring.py

@@ -23,12 +23,12 @@ ANDROID_DISTRIBUTION_NAME = "android"
 WIN32_DISTRIBUTION_NAME = "win32"
 
 # Qt 5.15 is currently only available using the maintenance tool.
-QT5_VERSION = "5.15"
-DEFAULT_QT_5_15_PATH = "~/Qt/5.15.0/gcc_64"
+QT5_VERSION = "5.15.0"
+DEFAULT_QT_PATH = "~/Qt/{0}/gcc_64".format(QT5_VERSION)
 
 # vs vars
 win_sdk_default = '10.0.16299.0'
-win_toolset_default = 'v142'
+win_toolset_default = '142'
 
 APT_BASED_DISTROS = [
     'debian',
@@ -353,7 +353,7 @@ def run_install(args):
             install_args += ("-c", "client-qt")
             install_args += ("-q", QT5_VERSION)
             if args.qt is '':
-                install_args += ("-Q", DEFAULT_QT_5_15_PATH)
+                install_args += ("-Q", DEFAULT_QT_PATH)
             else:
                 install_args += ("-Q", args.qt)
 
@@ -532,7 +532,7 @@ def parse_args():
                         help='Windows use only, specify Visual Studio toolset version')
         ap.add_argument('--sdk', default=win_sdk_default, type=str,
                         help='Windows use only, specify Windows SDK version')
-        ap.add_argument('--qtver', default='5.15.0',
+        ap.add_argument('--qtver', default=QT5_VERSION,
                         help='Sets the Qt version to build with')
 
     parsed_args = ap.parse_args()

packaging/rules/debian-one-click-install/jami-all.postinst

@@ -113,6 +113,8 @@ if [ -f /etc/os-release ]; then
         ENDTAG="ubuntu_19.10"
     elif [ "${UBUNTU_CODENAME}" = "focal" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.04" ]; then
         ENDTAG="ubuntu_20.04"
+    elif [ "${UBUNTU_CODENAME}" = "groovy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.10" ]; then
+        ENDTAG="ubuntu_20.10"
     else
         # Distribution is not supported. Don't provide automatic updates.
         CAN_ADD_DEB_SOURCE=false

packaging/rules/debian-one-click-install/rules

@@ -17,9 +17,15 @@ RING_ALL_IN_ONE_PKG_NAME="jami-all"
 
 # Bundled packages from contrib
 BUNDLED_PKGS = .ffmpeg
-ifeq ($(DISTRIBUTION),raspbian_10_armhf)
+ifeq (raspbian_10_armhf,$(findstring raspbian_10_armhf, $(DISTRIBUTION)))
 # Raspbian's yaml-cpp lib does not work properly
 BUNDLED_PKGS += .yaml-cpp
+# Add host environment variables
+CMAKE_OPTIONS=-DCHOST=${HOST_ARCH} \
+		-DCMAKE_C_COMPILER=${HOST_ARCH}-gcc \
+		-DCMAKE_CXX_COMPILER=${HOST_ARCH}-g++ \
+		-DCMAKE_FIND_ROOT_PATH=/usr/${HOST_ARCH} \
+		-DPKG_CONFIG_EXECUTABLE=/usr/bin/${HOST_ARCH}-pkg-config
 endif
 
 %:
@@ -44,6 +50,7 @@ override_dh_auto_configure:
 	mkdir -p daemon/contrib/native
 	cd daemon/contrib/native && \
         ../bootstrap \
+				--host=${HOST_ARCH} \
 				--disable-downloads \
 				--no-checksums \
 				--disable-ogg \
@@ -63,7 +70,8 @@ override_dh_auto_configure:
 		./autogen.sh && \
 		./configure \
 				--prefix=/usr \
-				--disable-shared
+				--disable-shared \
+				--host=${HOST_ARCH}
 
 	#############################
 	## libringclient configure ##
@@ -75,6 +83,7 @@ override_dh_auto_configure:
 			-DRING_BUILD_DIR=$(CURDIR)/daemon/src \
 			-DCMAKE_INSTALL_PREFIX=/usr \
 			-DCMAKE_BUILD_TYPE=Debug \
+			$(CMAKE_OPTIONS) \
 			..
 
 	############################
@@ -87,6 +96,7 @@ override_dh_auto_configure:
 			-DCMAKE_INSTALL_PREFIX=/usr \
 			-DLibRingClient_PROJECT_DIR=/$(CURDIR)/lrc \
 			-DGSETTINGS_LOCALCOMPILE=OFF \
+			$(CMAKE_OPTIONS) \
 			..
 
 	dh_auto_configure

packaging/rules/debian/rules

@@ -19,9 +19,15 @@ RING_DAEMON_PKG_NAME="jami-daemon"
 
 # Bundled packages from contrib
 BUNDLED_PKGS = .ffmpeg
-ifeq ($(DISTRIBUTION),raspbian_10_armhf)
+ifeq (raspbian_10_armhf,$(findstring raspbian_10_armhf, $(DISTRIBUTION)))
 # Raspbian's yaml-cpp lib does not work properly
 BUNDLED_PKGS += .yaml-cpp
+# Add host environment variables
+CMAKE_OPTIONS=-DCHOST=${HOST_ARCH} \
+		-DCMAKE_C_COMPILER=${HOST_ARCH}-gcc \
+		-DCMAKE_CXX_COMPILER=${HOST_ARCH}-g++ \
+		-DCMAKE_FIND_ROOT_PATH=/usr/${HOST_ARCH} \
+		-DPKG_CONFIG_EXECUTABLE=/usr/bin/${HOST_ARCH}-pkg-config
 endif
 
 %:
@@ -46,6 +52,7 @@ override_dh_auto_configure:
 	mkdir -p daemon/contrib/native
 	cd daemon/contrib/native && \
         ../bootstrap \
+				--host=${HOST_ARCH} \
 				--disable-downloads \
 				--no-checksums \
 				--disable-ogg \
@@ -65,7 +72,8 @@ override_dh_auto_configure:
 		./autogen.sh && \
 		./configure \
 				--prefix=/usr \
-				--disable-shared
+				--disable-shared \
+				--host=${HOST_ARCH}
 
 	#############################
 	## libringclient configure ##
@@ -77,6 +85,7 @@ override_dh_auto_configure:
 			-DRING_BUILD_DIR=$(CURDIR)/daemon/src \
 			-DCMAKE_INSTALL_PREFIX=/usr \
 			-DCMAKE_BUILD_TYPE=Debug \
+			$(CMAKE_OPTIONS) \
 			..
 
 	############################
@@ -89,6 +98,7 @@ override_dh_auto_configure:
 			-DCMAKE_INSTALL_PREFIX=/usr \
 			-DLibRingClient_PROJECT_DIR=/$(CURDIR)/lrc \
 			-DGSETTINGS_LOCALCOMPILE=OFF \
+			$(CMAKE_OPTIONS) \
 			..
 
 	dh_auto_configure

scripts/build-package-debian.sh

@@ -41,11 +41,23 @@ else
     cp -r ${DEBIAN_PACKAGING_OVERRIDE}/* debian/
 fi
 
+DPKG_BUILD_OPTIONS=""
+MKBUILD_OPTIONS=""
+# Set the host architecture as armhf and add some specific architecture
+# options to the package builder.
+if grep -q "raspbian_10_armhf" <<< "${DISTRIBUTION}"; then
+    echo "Adding armhf as the host architecture."
+    export HOST_ARCH=arm-linux-gnueabihf
+    dpkg --add-architecture armhf
+    DPKG_BUILD_OPTIONS="${DPKG_BUILD_OPTIONS} -a armhf"
+    MKBUILD_OPTIONS="${MKBUILD_OPTIONS} --host-arch armhf"
+fi
+
 # install build deps
 apt-get clean
 apt-get update
-apt-get upgrade -o Acquire::Retires=10 -y
-mk-build-deps --remove --install debian/control -t "apt-get -y --no-install-recommends"
+apt-get upgrade -o Acquire::Retries=10 -y
+mk-build-deps ${MKBUILD_OPTIONS} --remove --install debian/control -t "apt-get -y --no-install-recommends"
 
 # create changelog file
 DEBEMAIL="The Jami project <jami@gnu.org>" dch --create --package jami --newversion ${DEBIAN_VERSION} "Automatic nightly release"
@@ -74,7 +86,7 @@ cd ring-project
 cp --verbose -r /opt/ring-project/debian .
 
 # create the package
-dpkg-buildpackage -uc -us
+dpkg-buildpackage -uc -us ${DPKG_BUILD_OPTIONS}
 
 # move the artifacts to output
 cd ..

scripts/make-packaging-target.py

@@ -238,7 +238,6 @@ def run_generate_all(parsed_args):
             "debian_packaging_override": "",
             "output_file": "$(DEBIAN_DSC_FILENAME)",
             "options": "--privileged --security-opt apparmor=docker-default",
-            "qemu_static": 'qemu-arm-static',
         },
         {
             "distribution": "raspbian_10_armhf_oci",
@@ -247,7 +246,6 @@ def run_generate_all(parsed_args):
             "output_file": "$(DEBIAN_DSC_FILENAME)",
             "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
             "version": "$(DEBIAN_OCI_VERSION)",
-            "qemu_static": 'qemu-arm-static',
         },
         # Ubuntu
         {
@@ -318,6 +316,20 @@ def run_generate_all(parsed_args):
             "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
             "version": "$(DEBIAN_OCI_VERSION)",
         },
+        {
+            "distribution": "ubuntu_20.10",
+            "debian_packaging_override": "",
+            "output_file": "$(DEBIAN_DSC_FILENAME)",
+            "options": "--privileged --security-opt apparmor=docker-default",
+        },
+        {
+            "distribution": "ubuntu_20.10_oci",
+            "docker_image": "ubuntu_20.10",
+            "debian_packaging_override": "",
+            "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
+            "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
+            "version": "$(DEBIAN_OCI_VERSION)",
+        },
 
         # Fedora
         {