From 221fee739a2afbc12b4aed7862f66401abbe99e8 Mon Sep 17 00:00:00 2001
From: Eden Abitbol <eden.abitbol@savoirfairelinux.com>
Date: Thu, 19 Sep 2019 14:31:24 -0400
Subject: [PATCH] upnp: remove system upnp library dependency
The libupnp available for system download (v1.8.2) causes
intermittent crashes. The one compiled locally is a newer version
(v1.8.4) that doesn't crash.
Change-Id: I5ae02553a845488cba0c0617ec1816e2d81cd4f3
---
docker/Dockerfile_debian_10 | 1 -
docker/Dockerfile_debian_10_i386 | 1 -
docker/Dockerfile_debian_9 | 1 -
docker/Dockerfile_debian_9_i386 | 1 -
docker/Dockerfile_fedora_27 | 1 -
docker/Dockerfile_fedora_28 | 1 -
docker/Dockerfile_fedora_29 | 1 -
docker/Dockerfile_fedora_30 | 1 -
docker/Dockerfile_ubuntu_16.04 | 1 -
docker/Dockerfile_ubuntu_16.04_i386 | 1 -
docker/Dockerfile_ubuntu_18.04 | 1 -
docker/Dockerfile_ubuntu_18.04_i386 | 1 -
docker/Dockerfile_ubuntu_18.10 | 1 -
docker/Dockerfile_ubuntu_18.10_i386 | 1 -
docker/Dockerfile_ubuntu_19.04 | 1 -
docker/Dockerfile_ubuntu_19.04_i386 | 1 -
make-ring.py | 6 +++---
17 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/docker/Dockerfile_debian_10 b/docker/Dockerfile_debian_10
index dfc718bd..fbb47b55 100644
--- a/docker/Dockerfile_debian_10
+++ b/docker/Dockerfile_debian_10
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libargon2-0-dev \
libebook1.2-dev \
libcanberra-gtk3-dev \
diff --git a/docker/Dockerfile_debian_10_i386 b/docker/Dockerfile_debian_10_i386
index 898c109f..c9c2f82f 100644
--- a/docker/Dockerfile_debian_10_i386
+++ b/docker/Dockerfile_debian_10_i386
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libargon2-0-dev \
libebook1.2-dev \
libcanberra-gtk3-dev \
diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
index 988b1242..fee24021 100644
--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libargon2-0-dev \
libebook1.2-dev \
libcanberra-gtk3-dev \
diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
index 3178b305..7f44be65 100644
--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libargon2-0-dev \
libebook1.2-dev \
libcanberra-gtk3-dev \
diff --git a/docker/Dockerfile_fedora_27 b/docker/Dockerfile_fedora_27
index 3be33091..8b1516d0 100644
--- a/docker/Dockerfile_fedora_27
+++ b/docker/Dockerfile_fedora_27
@@ -34,7 +34,6 @@ RUN dnf upgrade -y && \
check \
astyle \
uuid-c++-devel \
- libupnp-devel \
gettext-devel \
gcc-c++ \
which \
diff --git a/docker/Dockerfile_fedora_28 b/docker/Dockerfile_fedora_28
index 573808ba..475aa2a1 100644
--- a/docker/Dockerfile_fedora_28
+++ b/docker/Dockerfile_fedora_28
@@ -34,7 +34,6 @@ RUN dnf upgrade -y && \
check \
astyle \
uuid-c++-devel \
- libupnp-devel \
gettext-devel \
gcc-c++ \
which \
diff --git a/docker/Dockerfile_fedora_29 b/docker/Dockerfile_fedora_29
index 4fed738f..a1b99992 100644
--- a/docker/Dockerfile_fedora_29
+++ b/docker/Dockerfile_fedora_29
@@ -38,7 +38,6 @@ RUN dnf upgrade -y && \
check \
astyle \
uuid-c++-devel \
- libupnp-devel \
gettext-devel \
gcc-c++ \
which \
diff --git a/docker/Dockerfile_fedora_30 b/docker/Dockerfile_fedora_30
index 883c10da..6ec1f07e 100644
--- a/docker/Dockerfile_fedora_30
+++ b/docker/Dockerfile_fedora_30
@@ -37,7 +37,6 @@ RUN dnf upgrade -y && \
check \
astyle \
uuid-c++-devel \
- libupnp-devel \
gettext-devel \
gcc-c++ \
which \
diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04
index cab02f4f..582ca1b0 100644
--- a/docker/Dockerfile_ubuntu_16.04
+++ b/docker/Dockerfile_ubuntu_16.04
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libgnutls28-dev \
libebook1.2-dev \
libcanberra-gtk3-dev \
diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386
index e1178d1c..abb4e454 100644
--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ b/docker/Dockerfile_ubuntu_16.04_i386
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libgnutls28-dev \
libebook1.2-dev \
libcanberra-gtk3-dev \
diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_18.04
index 9d135387..59932cc7 100644
--- a/docker/Dockerfile_ubuntu_18.04
+++ b/docker/Dockerfile_ubuntu_18.04
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
diff --git a/docker/Dockerfile_ubuntu_18.04_i386 b/docker/Dockerfile_ubuntu_18.04_i386
index f77cad36..5a7e0629 100644
--- a/docker/Dockerfile_ubuntu_18.04_i386
+++ b/docker/Dockerfile_ubuntu_18.04_i386
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
diff --git a/docker/Dockerfile_ubuntu_18.10 b/docker/Dockerfile_ubuntu_18.10
index 3cfb38b0..094c6e71 100644
--- a/docker/Dockerfile_ubuntu_18.10
+++ b/docker/Dockerfile_ubuntu_18.10
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
diff --git a/docker/Dockerfile_ubuntu_18.10_i386 b/docker/Dockerfile_ubuntu_18.10_i386
index 9025f922..3a172ae4 100644
--- a/docker/Dockerfile_ubuntu_18.10_i386
+++ b/docker/Dockerfile_ubuntu_18.10_i386
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
diff --git a/docker/Dockerfile_ubuntu_19.04 b/docker/Dockerfile_ubuntu_19.04
index 3cbad041..d72bc0eb 100644
--- a/docker/Dockerfile_ubuntu_19.04
+++ b/docker/Dockerfile_ubuntu_19.04
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
diff --git a/docker/Dockerfile_ubuntu_19.04_i386 b/docker/Dockerfile_ubuntu_19.04_i386
index 2bc1f302..9565113a 100644
--- a/docker/Dockerfile_ubuntu_19.04_i386
+++ b/docker/Dockerfile_ubuntu_19.04_i386
@@ -18,7 +18,6 @@ RUN apt-get update && \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
- libupnp-dev \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
diff --git a/make-ring.py b/make-ring.py
index 46a7450c..d41a00e8 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -75,7 +75,7 @@ ZYPPER_DEPENDENCIES = [
'curl', 'gzip', 'bzip2',
# daemon
'speexdsp-devel', 'speex-devel', 'libdbus-c++-devel', 'jsoncpp-devel', 'yaml-cpp-devel',
- 'libupnp-devel', 'yasm', 'libuuid-devel', 'libnettle-devel', 'libopus-devel',
+ 'yasm', 'libuuid-devel', 'libnettle-devel', 'libopus-devel',
'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel', 'libavdevice-devel', 'pcre-devel',
'alsa-devel', 'libpulse-devel', 'libudev-devel', 'libva-devel', 'libvdpau-devel',
'libopenssl-devel',
@@ -127,7 +127,7 @@ APT_DEPENDENCIES = [
'libgtk-3-dev', 'libjack-dev', 'libnotify-dev',
'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libssl-dev',
'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
- 'libudev-dev', 'libupnp1.8-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'libqt5sql5-sqlite', 'sip-tester', 'swig',
+ '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'
]
@@ -136,7 +136,7 @@ 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', 'libupnp', 'yaml-cpp', 'qt5-base',
+ 'speex', 'speexdsp', 'libtool', 'yaml-cpp', 'qt5-base',
'swig', 'yasm', 'qrencode', 'make', 'patch', 'pkg-config',
'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau', 'libcanberra', 'openssl'
]
--
GitLab