From a23db0b9a79b601986396f04bd52c9fa3ccd5eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 29 Sep 2020 16:16:46 -0400
Subject: [PATCH] dockerfile: add nasm (necessary for x264)
Change-Id: I90999754457ef714757bb60787c91f89ec9953bd
---
docker/Dockerfile_debian_10 | 2 +-
docker/Dockerfile_debian_10_arm64 | 2 +-
docker/Dockerfile_debian_10_armhf | 2 +-
docker/Dockerfile_debian_10_i386 | 2 +-
docker/Dockerfile_debian_9 | 2 +-
docker/Dockerfile_debian_9_armhf | 2 +-
docker/Dockerfile_debian_9_i386 | 2 +-
docker/Dockerfile_fedora_27 | 2 +-
docker/Dockerfile_fedora_28 | 2 +-
docker/Dockerfile_fedora_29 | 2 +-
docker/Dockerfile_fedora_30 | 2 +-
docker/Dockerfile_fedora_31 | 2 +-
docker/Dockerfile_fedora_32 | 2 +-
docker/Dockerfile_opensuse-leap_15.1 | 2 +-
docker/Dockerfile_raspbian_10_armhf | 2 +-
docker/Dockerfile_rhel_8 | 1 +
make-ring.py | 8 ++++----
17 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/docker/Dockerfile_debian_10 b/docker/Dockerfile_debian_10
index 86cd14ba..6bd069d3 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 968eab4b..77c9e711 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 2e6cf456..e1d12e5e 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 caebd287..15e1f627 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 eafb8c61..a07d3e9d 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 ac175945..2dbafcb1 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 fa72ca17..a8930273 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 8b1516d0..cdb5f8ea 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 475aa2a1..cfaad5ca 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 a1b99992..da6376fe 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 6ec1f07e..a80d8cdf 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 b2ba1a97..ce62df9e 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 6b862e7a..71d59e5f 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 06c99ecf..f335251b 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 0a9ee52e..c3a48529 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 a09bd992..f339229d 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 \
diff --git a/make-ring.py b/make-ring.py
index c3059377..f652d789 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -86,7 +86,7 @@ ZYPPER_INSTALL_SCRIPT = [
ZYPPER_DEPENDENCIES = [
# build system
'autoconf', 'autoconf-archive', 'automake', 'cmake', 'patch', 'gcc-c++',
- 'libtool', 'which', 'pandoc',
+ 'libtool', 'which', 'pandoc','nasm',
# contrib dependencies
'curl', 'gzip', 'bzip2',
# daemon
@@ -115,7 +115,7 @@ 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 = [
@@ -130,7 +130,7 @@ 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 = [
@@ -140,7 +140,7 @@ PACMAN_DEPENDENCIES = [
'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'
+ 'openssl', 'pandoc', 'nasm'
]
OSX_DEPENDENCIES = [
--
GitLab