diff --git a/Makefile.packaging b/Makefile.packaging
index 26d06b9cd2055e8fcc9cb7d003ce4195cfb37754..17a3bf1217f25a1e64ed33d455d6272ab3ba95a1 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -92,10 +92,6 @@ package-all: package-debian_9 \
package-debian_10_armhf_oci \
package-debian_10_arm64_oci \
package-raspbian_10_armhf \
- package-ubuntu_16.04 \
- package-ubuntu_16.04_i386 \
- package-ubuntu_16.04_oci \
- package-ubuntu_16.04_i386_oci \
package-ubuntu_18.04 \
package-ubuntu_18.04_i386 \
package-ubuntu_18.04_oci \
@@ -104,24 +100,12 @@ package-all: package-debian_9 \
package-ubuntu_18.10_i386 \
package-ubuntu_18.10_oci \
package-ubuntu_18.10_i386_oci \
- package-ubuntu_19.04 \
- package-ubuntu_19.04_i386 \
- package-ubuntu_19.04_oci \
- package-ubuntu_19.04_i386_oci \
package-ubuntu_19.10 \
package-ubuntu_19.10_i386 \
package-ubuntu_19.10_oci \
package-ubuntu_19.10_i386_oci \
package-ubuntu_20.04 \
package-ubuntu_20.04_oci \
- package-fedora_27 \
- package-fedora_27_i386 \
- package-fedora_28 \
- package-fedora_28_i386 \
- package-fedora_29 \
- package-fedora_29_i386 \
- package-fedora_30 \
- package-fedora_30_i386 \
package-fedora_31 \
package-fedora_31_i386 \
package-fedora_32 \
diff --git a/client-gnome b/client-gnome
index 36f0e140056325d81039ccb974242a0486ceb5b1..534b97ec5b7ef4fa130a6c0dc663cbcf890b9abe 160000
--- a/client-gnome
+++ b/client-gnome
@@ -1 +1 @@
-Subproject commit 36f0e140056325d81039ccb974242a0486ceb5b1
+Subproject commit 534b97ec5b7ef4fa130a6c0dc663cbcf890b9abe
diff --git a/daemon b/daemon
index 739f823fe6f4cecc82eadf799813164eebef536a..508e97f34f9299ad07f556544f8a13d84e93039e 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 739f823fe6f4cecc82eadf799813164eebef536a
+Subproject commit 508e97f34f9299ad07f556544f8a13d84e93039e
diff --git a/docker/Dockerfile_debian_10 b/docker/Dockerfile_debian_10
index 86cd14bab06d62e48c2000419aa8442d59a85524..6bd069d3917cd10e630d04d693ca97ed1e6ba834 100644
--- a/docker/Dockerfile_debian_10
+++ b/docker/Dockerfile_debian_10
@@ -15,6 +15,7 @@ RUN apt-get update && \
automake \
autopoint \
cmake \
+ nasm \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
@@ -29,7 +30,6 @@ RUN apt-get update && \
qttools5-dev \
qttools5-dev-tools \
yasm \
- nasm \
autotools-dev \
gettext \
libpulse-dev \
diff --git a/docker/Dockerfile_debian_10_arm64 b/docker/Dockerfile_debian_10_arm64
index 968eab4bdb4f62e76d394d6df507fb5ff0977cc5..77c9e711c61440d816f725a06283ebe107f06a15 100644
--- a/docker/Dockerfile_debian_10_arm64
+++ b/docker/Dockerfile_debian_10_arm64
@@ -19,6 +19,7 @@ RUN apt-get update && \
automake \
autopoint \
cmake \
+ nasm \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
@@ -33,7 +34,6 @@ RUN apt-get update && \
qttools5-dev \
qttools5-dev-tools \
yasm \
- nasm \
autotools-dev \
gettext \
libpulse-dev \
diff --git a/docker/Dockerfile_debian_10_armhf b/docker/Dockerfile_debian_10_armhf
index 2e6cf456046ba2af4b2768c6463a6c4b557b22f1..e1d12e5efd584fbe3c83be4bab2dd249fda599b6 100644
--- a/docker/Dockerfile_debian_10_armhf
+++ b/docker/Dockerfile_debian_10_armhf
@@ -19,6 +19,7 @@ RUN apt-get update && \
automake \
autopoint \
cmake \
+ nasm \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
@@ -33,7 +34,6 @@ RUN apt-get update && \
qttools5-dev \
qttools5-dev-tools \
yasm \
- nasm \
autotools-dev \
gettext \
libpulse-dev \
diff --git a/docker/Dockerfile_debian_10_i386 b/docker/Dockerfile_debian_10_i386
index caebd2876fdcf04ef02e234c6793d70e5b13e952..15e1f627a69bc4f6e595daa6868e367935729d26 100644
--- a/docker/Dockerfile_debian_10_i386
+++ b/docker/Dockerfile_debian_10_i386
@@ -15,6 +15,7 @@ RUN apt-get update && \
automake \
autopoint \
cmake \
+ nasm \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
@@ -29,7 +30,6 @@ RUN apt-get update && \
qttools5-dev \
qttools5-dev-tools \
yasm \
- nasm \
autotools-dev \
gettext \
libpulse-dev \
diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
index eafb8c61368c429ec7594188c27b23013f6ae758..a07d3e9dd1da0346cc1f8dba226fc67ad8018fb1 100644
--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -15,6 +15,7 @@ RUN apt-get update && \
automake \
autopoint \
cmake \
+ nasm \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
@@ -29,7 +30,6 @@ RUN apt-get update && \
qttools5-dev \
qttools5-dev-tools \
yasm \
- nasm \
autotools-dev \
gettext \
libpulse-dev \
diff --git a/docker/Dockerfile_debian_9_armhf b/docker/Dockerfile_debian_9_armhf
index ac175945231af10e9fb1a2b660803efdb9461838..2dbafcb13facc7447e1747e2c92604578365dcfc 100644
--- a/docker/Dockerfile_debian_9_armhf
+++ b/docker/Dockerfile_debian_9_armhf
@@ -19,6 +19,7 @@ RUN apt-get update && \
automake \
autopoint \
cmake \
+ nasm \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
@@ -33,7 +34,6 @@ RUN apt-get update && \
qttools5-dev \
qttools5-dev-tools \
yasm \
- nasm \
autotools-dev \
gettext \
libpulse-dev \
diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
index fa72ca17bf72fa3918f6f867c53976ce92c809bb..a89302735ca6e8e2c2a01631f16b1ce1b9022e98 100644
--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -15,6 +15,7 @@ RUN apt-get update && \
automake \
autopoint \
cmake \
+ nasm \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
@@ -29,7 +30,6 @@ RUN apt-get update && \
qttools5-dev \
qttools5-dev-tools \
yasm \
- nasm \
autotools-dev \
gettext \
libpulse-dev \
diff --git a/docker/Dockerfile_fedora_27 b/docker/Dockerfile_fedora_27
index 8b1516d02ba480f9472f13a8db512c3fa269410b..cdb5f8ea42926d6178d2d4c3a610087bf8bfd7ff 100644
--- a/docker/Dockerfile_fedora_27
+++ b/docker/Dockerfile_fedora_27
@@ -9,6 +9,7 @@ RUN dnf upgrade -y && \
git \
rpm-build \
tar \
+ nasm \
make \
autoconf \
automake \
@@ -27,7 +28,6 @@ RUN dnf upgrade -y && \
libXext-devel \
libXfixes-devel \
yasm \
- nasm \
speex-devel \
gsm-devel \
chrpath \
diff --git a/docker/Dockerfile_fedora_28 b/docker/Dockerfile_fedora_28
index 475aa2a11b9224f68d66fa6fe5d7493e46c9e8cf..cfaad5cab7df5795b2dbd114b3934d97a3c2b5e6 100644
--- a/docker/Dockerfile_fedora_28
+++ b/docker/Dockerfile_fedora_28
@@ -9,6 +9,7 @@ RUN dnf upgrade -y && \
git \
rpm-build \
tar \
+ nasm \
make \
autoconf \
automake \
@@ -27,7 +28,6 @@ RUN dnf upgrade -y && \
libXext-devel \
libXfixes-devel \
yasm \
- nasm \
speex-devel \
gsm-devel \
chrpath \
diff --git a/docker/Dockerfile_fedora_29 b/docker/Dockerfile_fedora_29
index a1b9999208e3123a728d8096181fb99c765ea086..da6376fef53e1165950051e6ca6c237e3a3b6fe6 100644
--- a/docker/Dockerfile_fedora_29
+++ b/docker/Dockerfile_fedora_29
@@ -12,6 +12,7 @@ RUN dnf upgrade -y && \
git \
rpm-build \
tar \
+ nasm \
make \
autoconf \
automake \
@@ -31,7 +32,6 @@ RUN dnf upgrade -y && \
libXext-devel \
libXfixes-devel \
yasm \
- nasm \
speex-devel \
gsm-devel \
chrpath \
diff --git a/docker/Dockerfile_fedora_30 b/docker/Dockerfile_fedora_30
index 6ec1f07eb04415405523b66df83e5ccfaea16a2f..a80d8cdfbffb5d3645a4afb5355038b724ec0149 100644
--- a/docker/Dockerfile_fedora_30
+++ b/docker/Dockerfile_fedora_30
@@ -14,6 +14,7 @@ RUN dnf upgrade -y && \
make \
autoconf \
automake \
+ nasm \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
@@ -30,7 +31,6 @@ RUN dnf upgrade -y && \
libXext-devel \
libXfixes-devel \
yasm \
- nasm \
speex-devel \
gsm-devel \
chrpath \
diff --git a/docker/Dockerfile_fedora_31 b/docker/Dockerfile_fedora_31
index b2ba1a973fd6f75fa86888b293c7ce2202bc84c4..ce62df9ea8cacc10b8522d0ef463e0c96fa34e57 100644
--- a/docker/Dockerfile_fedora_31
+++ b/docker/Dockerfile_fedora_31
@@ -14,6 +14,7 @@ RUN dnf upgrade -y && \
make \
autoconf \
automake \
+ nasm \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
@@ -30,7 +31,6 @@ RUN dnf upgrade -y && \
libXext-devel \
libXfixes-devel \
yasm \
- nasm \
speex-devel \
gsm-devel \
chrpath \
diff --git a/docker/Dockerfile_fedora_32 b/docker/Dockerfile_fedora_32
index 6b862e7a5cdae91bd271fd270085173d4471c4e0..71d59e5f183987ca92ab4ea3da24e8ff2664fa0d 100644
--- a/docker/Dockerfile_fedora_32
+++ b/docker/Dockerfile_fedora_32
@@ -14,6 +14,7 @@ RUN dnf upgrade -y && \
make \
autoconf \
automake \
+ nasm \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
@@ -30,7 +31,6 @@ RUN dnf upgrade -y && \
libXext-devel \
libXfixes-devel \
yasm \
- nasm \
speex-devel \
gsm-devel \
chrpath \
diff --git a/docker/Dockerfile_opensuse-leap_15.1 b/docker/Dockerfile_opensuse-leap_15.1
index 06c99ecf9a25f2b1c84ba79bcce81c5745c64014..f335251b9b772afef241970ad1e6c593535c47c0 100644
--- a/docker/Dockerfile_opensuse-leap_15.1
+++ b/docker/Dockerfile_opensuse-leap_15.1
@@ -18,6 +18,7 @@ RUN zypper --non-interactive up -y && \
autoconf \
automake \
cmake \
+ nasm \
speexdsp-devel \
libpulse-devel \
libcanberra-devel \
@@ -32,7 +33,6 @@ RUN zypper --non-interactive up -y && \
libXext-devel \
libXfixes-devel \
yasm \
- nasm \
speex-devel \
libgsm-devel \
chrpath \
diff --git a/docker/Dockerfile_raspbian_10_armhf b/docker/Dockerfile_raspbian_10_armhf
index 0a9ee52e5f7a797a93f1bc07a99e0328ea021535..c3a4852984f315a1c714017a6034b364f2787ff1 100644
--- a/docker/Dockerfile_raspbian_10_armhf
+++ b/docker/Dockerfile_raspbian_10_armhf
@@ -21,6 +21,7 @@ RUN apt-get update && \
autopoint \
cmake \
libtool \
+ nasm \
libdbus-1-dev \
libdbus-c++-dev \
libargon2-0-dev \
@@ -34,7 +35,6 @@ RUN apt-get update && \
qttools5-dev \
qttools5-dev-tools \
yasm \
- nasm \
autotools-dev \
gettext \
libpulse-dev \
diff --git a/docker/Dockerfile_rhel_8 b/docker/Dockerfile_rhel_8
index a09bd992eec38e39db68547a1792ae15e35a9579..810eb2c8adc65fa7765bd9d9d242c83f17af138e 100644
--- a/docker/Dockerfile_rhel_8
+++ b/docker/Dockerfile_rhel_8
@@ -21,6 +21,7 @@ RUN dnf upgrade -y && \
autoconf \
automake \
cmake \
+ nasm \
pulseaudio-libs-devel \
libcanberra-devel \
libcurl-devel \
@@ -66,7 +67,8 @@ RUN dnf upgrade -y && \
evolution-data-server \
evolution-devel \
qt5-qtbase-5.11.1-7.el8.i686 \
- dbus-c++
+ dbus-c++ \
+ jsoncpp-devel
ADD scripts/build-package-rhel.sh /opt/build-package-rhel.sh
diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04
deleted file mode 100644
index 85373d69c2f9318c544d74cda276a8a83f93ba9e..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_16.04
+++ /dev/null
@@ -1,68 +0,0 @@
-FROM ubuntu:16.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y vim devscripts equivs
-
-# Speed up mk-build-deps
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retries=10 \
- git \
- autoconf \
- automake \
- autopoint \
- cmake \
- libtool \
- libdbus-1-dev \
- libdbus-c++-dev \
- libgnutls28-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 \
- libnatpmp-dev \
- libappindicator3-dev \
- libqrencode-dev \
- libnm-dev \
- libwebkit2gtk-4.0-dev \
- libcrypto++-dev \
- libva-dev \
- libvdpau-dev \
- libssl-dev \
- libsndfile1-dev
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386
deleted file mode 100644
index fa25b6e626b7eefcd2c299af8ee002e5f39b42c1..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ /dev/null
@@ -1,68 +0,0 @@
-FROM i386/ubuntu:16.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y vim devscripts equivs
-
-# Speed up mk-build-deps
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retries=10 \
- git \
- autoconf \
- automake \
- autopoint \
- cmake \
- libtool \
- libdbus-1-dev \
- libdbus-c++-dev \
- libgnutls28-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 \
- libnatpmp-dev \
- libappindicator3-dev \
- libqrencode-dev \
- libnm-dev \
- libwebkit2gtk-4.0-dev \
- libcrypto++-dev \
- libva-dev \
- libvdpau-dev \
- libssl-dev \
- libsndfile1-dev
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_18.10 b/docker/Dockerfile_ubuntu_18.10
deleted file mode 100644
index cfeb60af7721e6d806295066a2ca5b0a1601787c..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_18.10
+++ /dev/null
@@ -1,70 +0,0 @@
-FROM ubuntu:18.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=10 \
- 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 \
- libsndfile1-dev
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_18.10_i386 b/docker/Dockerfile_ubuntu_18.10_i386
deleted file mode 100644
index dec0f6d0ad1458d89df5a66653475d020203d3aa..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_18.10_i386
+++ /dev/null
@@ -1,70 +0,0 @@
-FROM i386/ubuntu:18.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=10 \
- 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 \
- libsndfile1-dev
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_19.04 b/docker/Dockerfile_ubuntu_19.04
deleted file mode 100644
index a67a2201924cd514f03cdb35b6e9bacfa88a21d7..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_19.04
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM ubuntu:19.04
-
-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=10 \
- 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
diff --git a/docker/Dockerfile_ubuntu_19.04_i386 b/docker/Dockerfile_ubuntu_19.04_i386
deleted file mode 100644
index 51489a537f8d382f3d08345b4c9ab63b1e2d2970..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_19.04_i386
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM i386/ubuntu:19.04
-
-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=10 \
- 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
diff --git a/lrc b/lrc
index a0fafe5c596e20ce036261947e326ccb8bbbc48a..a1469b83a1c10f42a2997385c0e6abf67420cacc 160000
--- a/lrc
+++ b/lrc
@@ -1 +1 @@
-Subproject commit a0fafe5c596e20ce036261947e326ccb8bbbc48a
+Subproject commit a1469b83a1c10f42a2997385c0e6abf67420cacc
diff --git a/make-ring.py b/make-ring.py
index 5e829f852e3f1ba70b49021b8e510c7a14112682..fad43298d02b32f18013f1e309e2c59ab651b89c 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -85,7 +85,8 @@ ZYPPER_INSTALL_SCRIPT = [
ZYPPER_DEPENDENCIES = [
# build system
- 'autoconf', 'autoconf-archive', 'automake', 'cmake', 'patch', 'gcc-c++', 'libtool', 'which',
+ 'autoconf', 'autoconf-archive', 'automake', 'cmake', 'make', 'patch', 'gcc-c++',
+ 'libtool', 'which', 'pandoc','nasm',
# contrib dependencies
'curl', 'gzip', 'bzip2',
# daemon
@@ -103,7 +104,7 @@ ZYPPER_DEPENDENCIES = [
]
DNF_DEPENDENCIES = [
- 'autoconf', 'autoconf-archive', 'automake', 'cmake', 'speexdsp-devel', 'pulseaudio-libs-devel',
+ 'autoconf', 'autoconf-archive', 'automake', 'cmake', 'make', 'speexdsp-devel', 'pulseaudio-libs-devel',
'libtool', 'dbus-devel', 'expat-devel', 'pcre-devel',
'yaml-cpp-devel', 'boost-devel', 'dbus-c++-devel', 'dbus-devel',
'libXext-devel', 'libXfixes-devel', 'yasm',
@@ -114,11 +115,11 @@ DNF_DEPENDENCIES = [
'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel',
'libnotify-devel', 'libappindicator-gtk3-devel', 'patch', 'libva-devel', 'openssl-devel',
'webkitgtk4-devel', 'NetworkManager-libnm-devel', 'libvdpau-devel', 'msgpack-devel', 'libcanberra-devel',
- 'sqlite-devel', 'openssl-static', 'pandoc'
+ 'sqlite-devel', 'openssl-static', 'pandoc', 'nasm'
]
APT_DEPENDENCIES = [
- 'autoconf', 'autoconf-archive', 'autopoint', 'automake', 'cmake', 'dbus', 'doxygen', 'g++',
+ 'autoconf', 'autoconf-archive', 'autopoint', 'automake', 'cmake', 'make', 'dbus', 'doxygen', 'g++',
'gettext', 'gnome-icon-theme-symbolic', 'libasound2-dev', 'libavcodec-dev',
'libavdevice-dev', 'libavformat-dev', 'libboost-dev',
'libclutter-gtk-1.0-dev', 'libcppunit-dev', 'libdbus-1-dev',
@@ -129,16 +130,17 @@ APT_DEPENDENCIES = [
'libudev-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'libqt5sql5-sqlite', 'sip-tester', 'swig',
'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-dev', 'libvdpau-dev', 'libmsgpack-dev', 'libcanberra-gtk3-dev',
- 'pandoc'
+ 'pandoc', 'nasm'
]
PACMAN_DEPENDENCIES = [
- 'autoconf', 'autoconf-archive', 'gettext', 'cmake', 'dbus', 'doxygen', 'gcc', 'gnome-icon-theme-symbolic',
- 'ffmpeg', 'boost', 'clutter-gtk', 'cppunit', 'libdbus', 'dbus-c++', 'libe-book',
- 'expat', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse',
- 'speex', 'speexdsp', 'libtool', 'yaml-cpp', 'qt5-base',
- 'swig', 'yasm', 'qrencode', 'make', 'patch', 'pkg-config',
- 'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau', 'libcanberra', 'openssl'
+ 'autoconf', 'autoconf-archive', 'gettext', 'cmake', 'dbus', 'doxygen', 'gcc',
+ 'gnome-icon-theme-symbolic', 'ffmpeg', 'boost', 'clutter-gtk', 'cppunit',
+ 'libdbus', 'dbus-c++', 'libe-book', 'expat', 'gtk3', 'jack', 'libnotify',
+ 'opus', 'pcre', 'libpulse', 'speex', 'speexdsp', 'libtool', 'yaml-cpp',
+ 'qt5-base', 'swig', 'yasm', 'qrencode', 'make', 'patch', 'pkg-config',
+ 'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau', 'libcanberra',
+ 'openssl', 'pandoc', 'nasm'
]
OSX_DEPENDENCIES = [
diff --git a/packaging/rules/rhel/jami-one-click.spec b/packaging/rules/rhel/jami-one-click.spec
index 5d5fadc19c9514823d344b93063557fd79f09f70..dfb1c70c69f9a96425e22a791830735217e0fd6e 100644
--- a/packaging/rules/rhel/jami-one-click.spec
+++ b/packaging/rules/rhel/jami-one-click.spec
@@ -51,6 +51,7 @@ BuildRequires: clutter
BuildRequires: clutter-devel
BuildRequires: clutter-gtk-devel
BuildRequires: qrencode-devel
+BuildRequires: nasm
BuildRequires: yasm
BuildRequires: opus
BuildRequires: opus-devel
diff --git a/packaging/rules/rhel/jami.spec b/packaging/rules/rhel/jami.spec
index e755c5fc086c64e93d5c2ec244fadadc7cd90090..9871b59d011237a2762ea8655215be8704f38736 100644
--- a/packaging/rules/rhel/jami.spec
+++ b/packaging/rules/rhel/jami.spec
@@ -52,6 +52,7 @@ BuildRequires: clutter
BuildRequires: clutter-devel
BuildRequires: clutter-gtk-devel
BuildRequires: qrencode-devel
+BuildRequires: nasm
BuildRequires: yasm
BuildRequires: opus
BuildRequires: opus-devel
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 32fa9c9230db299504270444ea571581aa18b696..7b5188958a2f666cebc55f1bbd643832cfba4f28 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -250,32 +250,6 @@ def run_generate_all(parsed_args):
"qemu_static": 'qemu-arm-static',
},
# Ubuntu
- {
- "distribution": "ubuntu_16.04",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- },
- {
- "distribution": "ubuntu_16.04_i386",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- },
- {
- "distribution": "ubuntu_16.04_oci",
- "docker_image": "ubuntu_16.04",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
- "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
- "version": "$(DEBIAN_OCI_VERSION)",
- },
- {
- "distribution": "ubuntu_16.04_i386_oci",
- "docker_image": "ubuntu_16.04_i386",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
- "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
- "version": "$(DEBIAN_OCI_VERSION)",
- },
{
"distribution": "ubuntu_18.04",
"debian_packaging_override": "",
@@ -302,62 +276,6 @@ def run_generate_all(parsed_args):
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
"version": "$(DEBIAN_OCI_VERSION)",
},
- {
- "distribution": "ubuntu_18.10",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "ubuntu_18.10_i386",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "ubuntu_18.10_oci",
- "docker_image": "ubuntu_18.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)",
- },
- {
- "distribution": "ubuntu_18.10_i386_oci",
- "docker_image": "ubuntu_18.10_i386",
- "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)",
- },
- {
- "distribution": "ubuntu_19.04",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "ubuntu_19.04_i386",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "ubuntu_19.04_oci",
- "docker_image": "ubuntu_19.04",
- "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)",
- },
- {
- "distribution": "ubuntu_19.04_i386_oci",
- "docker_image": "ubuntu_19.04_i386",
- "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)",
- },
{
"distribution": "ubuntu_19.10",
"debian_packaging_override": "",
@@ -402,52 +320,6 @@ def run_generate_all(parsed_args):
},
# Fedora
- {
- "distribution": "fedora_27",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- },
- {
- "distribution": "fedora_27_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- },
- {
- "distribution": "fedora_28",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
- {
- "distribution": "fedora_28_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
- {
- "distribution": "fedora_29",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
- {
- "distribution": "fedora_29_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
- {
- "distribution": "fedora_30",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
- {
- "distribution": "fedora_30_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
{
"distribution": "fedora_31",
"debian_packaging_override": "",