Skip to content
Snippets Groups Projects
Commit a9f8c7da authored by Guillaume Roguez's avatar Guillaume Roguez Committed by Adrien Béraud
Browse files

add msgpack as in platform dependencies

Missing in all GNU/Linux distributions.
Note: added only in officialy supported ones

Change-Id: I9ff01b728d8c8a554de4698c13c53e6faeb305fa
parent f4bb4982
Branches
No related tags found
No related merge requests found
FROM fedora:25 FROM fedora:25
RUN dnf clean all
RUN dnf install -y yum-utils rpmdevtools
RUN dnf clean all RUN dnf clean all
RUN dnf upgrade -y && \ RUN dnf upgrade -y && \
dnf install -y \ dnf install -y \
...@@ -51,7 +48,14 @@ RUN dnf upgrade -y && \ ...@@ -51,7 +48,14 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \ webkitgtk4-devel \
cryptopp-devel \ cryptopp-devel \
libva-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 ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
...@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \ ...@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \ webkitgtk4-devel \
cryptopp-devel \ cryptopp-devel \
libva-devel \ libva-devel \
libvdpau-devel libvdpau-devel \
msgpack-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
...@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \ ...@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \ webkitgtk4-devel \
cryptopp-devel \ cryptopp-devel \
libva-devel \ libva-devel \
libvdpau-devel libvdpau-devel \
msgpack-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
...@@ -84,14 +84,16 @@ MINGW64_FEDORA_DEPENDENCIES = [ ...@@ -84,14 +84,16 @@ MINGW64_FEDORA_DEPENDENCIES = [
'mingw64-binutils', 'mingw64-gcc', 'mingw64-headers', 'mingw64-crt', 'mingw64-gcc-c++', 'mingw64-binutils', 'mingw64-gcc', 'mingw64-headers', 'mingw64-crt', 'mingw64-gcc-c++',
'mingw64-pkg-config', 'yasm', 'gettext-devel', 'cmake', 'patch', 'libtool', 'automake', 'mingw64-pkg-config', 'yasm', 'gettext-devel', 'cmake', 'patch', 'libtool', 'automake',
'autoconf', 'autoconf-archive', 'make', 'xz', 'bzip2', 'which', 'mingw64-qt5-qtbase', '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_FEDORA_DEPENDENCIES = [
'mingw32-binutils', 'mingw32-gcc', 'mingw32-headers', 'mingw32-crt', 'mingw32-gcc-c++', 'mingw32-binutils', 'mingw32-gcc', 'mingw32-headers', 'mingw32-crt', 'mingw32-gcc-c++',
'mingw32-pkg-config', 'yasm', 'gettext-devel', 'cmake', 'patch', 'libtool', 'automake', 'mingw32-pkg-config', 'yasm', 'gettext-devel', 'cmake', 'patch', 'libtool', 'automake',
'autoconf', 'autoconf-archive', 'make', 'xz', 'bzip2', 'which', 'mingw32-qt5-qtbase', '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 = [ FEDORA_DEPENDENCIES = [
...@@ -105,7 +107,7 @@ FEDORA_DEPENDENCIES = [ ...@@ -105,7 +107,7 @@ FEDORA_DEPENDENCIES = [
'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel', 'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel',
'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-devel', 'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-devel',
'libnotify-devel', 'libappindicator-gtk3-devel', 'patch', 'libva-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 = [ UBUNTU_DEPENDENCIES = [
...@@ -120,7 +122,7 @@ UBUNTU_DEPENDENCIES = [ ...@@ -120,7 +122,7 @@ UBUNTU_DEPENDENCIES = [
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig', 'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev', 'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
'libva-dev', 'libnm-glib-dev', 'libva-dev', 'libnm-glib-dev',
'libwebkit2gtk-4.0-dev', 'libvdpau-dev' 'libwebkit2gtk-4.0-dev', 'libvdpau-dev', 'libmsgpack-dev'
] ]
DEBIAN_DEPENDENCIES = [ DEBIAN_DEPENDENCIES = [
...@@ -134,7 +136,7 @@ DEBIAN_DEPENDENCIES = [ ...@@ -134,7 +136,7 @@ DEBIAN_DEPENDENCIES = [
'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool', 'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig', 'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev', '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 = [ ARCH_LINUX_DEPENDENCIES = [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment