From a9f8c7da299b985c1303576480e5f5d2fe2aa1f7 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Thu, 13 Jul 2017 16:26:43 -0400
Subject: [PATCH] add msgpack as in platform dependencies
Missing in all GNU/Linux distributions.
Note: added only in officialy supported ones
Change-Id: I9ff01b728d8c8a554de4698c13c53e6faeb305fa
---
docker/Dockerfile_fedora_25 | 12 ++++++++----
docker/Dockerfile_fedora_25_i386 | 3 ++-
docker/Dockerfile_fedora_26 | 3 ++-
make-ring.py | 12 +++++++-----
4 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/docker/Dockerfile_fedora_25 b/docker/Dockerfile_fedora_25
index 2c99393a..30cd5a59 100644
--- a/docker/Dockerfile_fedora_25
+++ b/docker/Dockerfile_fedora_25
@@ -1,8 +1,5 @@
FROM fedora:25
-RUN dnf clean all
-RUN dnf install -y yum-utils rpmdevtools
-
RUN dnf clean all
RUN dnf upgrade -y && \
dnf install -y \
@@ -51,7 +48,14 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \
cryptopp-devel \
libva-devel \
- libvdpau-devel
+ libvdpau-devel \
+ msgpack-devel
+
+# Packaging tools
+RUN dnf install -y yum-utils rpmdevtools
+
+# Reduce image size
+RUN dnf clean all
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_25_i386 b/docker/Dockerfile_fedora_25_i386
index 8a65c802..85c21297 100644
--- a/docker/Dockerfile_fedora_25_i386
+++ b/docker/Dockerfile_fedora_25_i386
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \
cryptopp-devel \
libva-devel \
- libvdpau-devel
+ libvdpau-devel \
+ msgpack-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_26 b/docker/Dockerfile_fedora_26
index fd32a41b..c2aaf84d 100644
--- a/docker/Dockerfile_fedora_26
+++ b/docker/Dockerfile_fedora_26
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \
cryptopp-devel \
libva-devel \
- libvdpau-devel
+ libvdpau-devel \
+ msgpack-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/make-ring.py b/make-ring.py
index 597e57bb..6c94b4d6 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -84,14 +84,16 @@ MINGW64_FEDORA_DEPENDENCIES = [
'mingw64-binutils', 'mingw64-gcc', 'mingw64-headers', 'mingw64-crt', 'mingw64-gcc-c++',
'mingw64-pkg-config', 'yasm', 'gettext-devel', 'cmake', 'patch', 'libtool', 'automake',
'autoconf', 'autoconf-archive', 'make', 'xz', 'bzip2', 'which', 'mingw64-qt5-qtbase',
- 'mingw64-qt5-qttools', 'mingw64-qt5-qtsvg', 'mingw64-qt5-qtwinextras', 'mingw64-libidn', 'mingw64-xz-libs'
+ 'mingw64-qt5-qttools', 'mingw64-qt5-qtsvg', 'mingw64-qt5-qtwinextras', 'mingw64-libidn',
+ 'mingw64-xz-libs','msgpack-devel'
]
MINGW32_FEDORA_DEPENDENCIES = [
'mingw32-binutils', 'mingw32-gcc', 'mingw32-headers', 'mingw32-crt', 'mingw32-gcc-c++',
'mingw32-pkg-config', 'yasm', 'gettext-devel', 'cmake', 'patch', 'libtool', 'automake',
'autoconf', 'autoconf-archive', 'make', 'xz', 'bzip2', 'which', 'mingw32-qt5-qtbase',
- 'mingw32-qt5-qttools', 'mingw32-qt5-qtsvg', 'mingw32-qt5-qtwinextras', 'mingw32-libidn', 'mingw32-xz-libs'
+ 'mingw32-qt5-qttools', 'mingw32-qt5-qtsvg', 'mingw32-qt5-qtwinextras', 'mingw32-libidn',
+ 'mingw32-xz-libs', 'msgpack-devel'
]
FEDORA_DEPENDENCIES = [
@@ -105,7 +107,7 @@ FEDORA_DEPENDENCIES = [
'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel',
'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-devel',
'libnotify-devel', 'libappindicator-gtk3-devel', 'patch', 'libva-devel',
- 'webkitgtk4-devel', 'NetworkManager-glib-devel', 'libvdpau-devel'
+ 'webkitgtk4-devel', 'NetworkManager-glib-devel', 'libvdpau-devel', 'msgpack-devel'
]
UBUNTU_DEPENDENCIES = [
@@ -120,7 +122,7 @@ UBUNTU_DEPENDENCIES = [
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
'libva-dev', 'libnm-glib-dev',
- 'libwebkit2gtk-4.0-dev', 'libvdpau-dev'
+ 'libwebkit2gtk-4.0-dev', 'libvdpau-dev', 'libmsgpack-dev'
]
DEBIAN_DEPENDENCIES = [
@@ -134,7 +136,7 @@ DEBIAN_DEPENDENCIES = [
'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
- 'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-glib-dev', 'libvdpau-dev'
+ 'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-glib-dev', 'libvdpau-dev', 'libmsgpack-dev'
]
ARCH_LINUX_DEPENDENCIES = [
--
GitLab