From ae00a7ddfdf2e8ed860b5e0b36544eb88708a5d3 Mon Sep 17 00:00:00 2001
From: philippegorley <gorley.philippe@gmail.com>
Date: Tue, 31 Jul 2018 11:49:24 -0400
Subject: [PATCH] build: remove libsamplerate dependency
Change-Id: Icaeb11be9dd76c815150ec29ebad9cf0534a2144
---
docker/Dockerfile_debian_8 | 1 -
docker/Dockerfile_debian_8_i386 | 1 -
docker/Dockerfile_debian_9 | 1 -
docker/Dockerfile_debian_9_i386 | 1 -
docker/Dockerfile_fedora_22 | 1 -
docker/Dockerfile_fedora_22_i386 | 1 -
docker/Dockerfile_fedora_23 | 1 -
docker/Dockerfile_fedora_23_i386 | 1 -
docker/Dockerfile_fedora_24 | 1 -
docker/Dockerfile_fedora_24_i386 | 1 -
docker/Dockerfile_fedora_25 | 1 -
docker/Dockerfile_fedora_25_i386 | 1 -
docker/Dockerfile_fedora_26 | 1 -
docker/Dockerfile_fedora_27 | 1 -
docker/Dockerfile_fedora_28 | 1 -
docker/Dockerfile_ubuntu_14.04 | 1 -
docker/Dockerfile_ubuntu_14.04_i386 | 1 -
docker/Dockerfile_ubuntu_16.04 | 1 -
docker/Dockerfile_ubuntu_16.04_i386 | 1 -
docker/Dockerfile_ubuntu_16.10 | 1 -
docker/Dockerfile_ubuntu_16.10_i386 | 1 -
docker/Dockerfile_ubuntu_17.04 | 1 -
docker/Dockerfile_ubuntu_17.04_i386 | 1 -
docker/Dockerfile_ubuntu_17.10 | 1 -
docker/Dockerfile_ubuntu_17.10_i386 | 1 -
docker/Dockerfile_ubuntu_18.04 | 1 -
docker/Dockerfile_ubuntu_18.04_i386 | 1 -
make-ring.py | 10 +++++-----
packaging/rules/debian/control | 1 -
packaging/rules/fedora/ring.spec | 1 -
30 files changed, 5 insertions(+), 34 deletions(-)
diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8
index 232b03d3..6ee72560 100644
--- a/docker/Dockerfile_debian_8
+++ b/docker/Dockerfile_debian_8
@@ -33,7 +33,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_debian_8_i386 b/docker/Dockerfile_debian_8_i386
index b992fb95..c9d09f97 100644
--- a/docker/Dockerfile_debian_8_i386
+++ b/docker/Dockerfile_debian_8_i386
@@ -33,7 +33,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
index 8d2f2ebe..f72ae0b0 100644
--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -34,7 +34,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
index 679b5dc9..6527eab9 100644
--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -34,7 +34,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_fedora_22 b/docker/Dockerfile_fedora_22
index 23d776f9..1de9fec3 100644
--- a/docker/Dockerfile_fedora_22
+++ b/docker/Dockerfile_fedora_22
@@ -16,7 +16,6 @@ RUN dnf upgrade -y && \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
- libsamplerate-devel \
libtool \
dbus-devel \
expat-devel \
diff --git a/docker/Dockerfile_fedora_22_i386 b/docker/Dockerfile_fedora_22_i386
index b8811319..1559a91b 100644
--- a/docker/Dockerfile_fedora_22_i386
+++ b/docker/Dockerfile_fedora_22_i386
@@ -16,7 +16,6 @@ RUN dnf upgrade -y && \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
- libsamplerate-devel \
libtool \
dbus-devel \
expat-devel \
diff --git a/docker/Dockerfile_fedora_23 b/docker/Dockerfile_fedora_23
index ac5a6fb4..efb86d44 100644
--- a/docker/Dockerfile_fedora_23
+++ b/docker/Dockerfile_fedora_23
@@ -16,7 +16,6 @@ RUN dnf upgrade -y && \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
- libsamplerate-devel \
libtool \
dbus-devel \
expat-devel \
diff --git a/docker/Dockerfile_fedora_23_i386 b/docker/Dockerfile_fedora_23_i386
index 34c5b800..52e7f903 100644
--- a/docker/Dockerfile_fedora_23_i386
+++ b/docker/Dockerfile_fedora_23_i386
@@ -16,7 +16,6 @@ RUN dnf upgrade -y && \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
- libsamplerate-devel \
libtool \
dbus-devel \
expat-devel \
diff --git a/docker/Dockerfile_fedora_24 b/docker/Dockerfile_fedora_24
index c201db05..7fd6ad15 100644
--- a/docker/Dockerfile_fedora_24
+++ b/docker/Dockerfile_fedora_24
@@ -16,7 +16,6 @@ RUN dnf upgrade -y && \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
- libsamplerate-devel \
libtool \
dbus-devel \
expat-devel \
diff --git a/docker/Dockerfile_fedora_24_i386 b/docker/Dockerfile_fedora_24_i386
index 1d10d3b5..20f83f89 100644
--- a/docker/Dockerfile_fedora_24_i386
+++ b/docker/Dockerfile_fedora_24_i386
@@ -16,7 +16,6 @@ RUN dnf upgrade -y && \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
- libsamplerate-devel \
libtool \
dbus-devel \
expat-devel \
diff --git a/docker/Dockerfile_fedora_25 b/docker/Dockerfile_fedora_25
index b83ae7bd..62e89a4e 100644
--- a/docker/Dockerfile_fedora_25
+++ b/docker/Dockerfile_fedora_25
@@ -13,7 +13,6 @@ RUN dnf upgrade -y && \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
- libsamplerate-devel \
libtool \
dbus-devel \
expat-devel \
diff --git a/docker/Dockerfile_fedora_25_i386 b/docker/Dockerfile_fedora_25_i386
index 99b49e97..f1b2b0c3 100644
--- a/docker/Dockerfile_fedora_25_i386
+++ b/docker/Dockerfile_fedora_25_i386
@@ -16,7 +16,6 @@ RUN dnf upgrade -y && \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
- libsamplerate-devel \
libtool \
dbus-devel \
expat-devel \
diff --git a/docker/Dockerfile_fedora_26 b/docker/Dockerfile_fedora_26
index 7c08bfda..f3b87a6f 100644
--- a/docker/Dockerfile_fedora_26
+++ b/docker/Dockerfile_fedora_26
@@ -16,7 +16,6 @@ RUN dnf upgrade -y && \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
- libsamplerate-devel \
libtool \
dbus-devel \
expat-devel \
diff --git a/docker/Dockerfile_fedora_27 b/docker/Dockerfile_fedora_27
index 27156bb1..e7558220 100644
--- a/docker/Dockerfile_fedora_27
+++ b/docker/Dockerfile_fedora_27
@@ -16,7 +16,6 @@ RUN dnf upgrade -y && \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
- libsamplerate-devel \
libtool \
dbus-devel \
expat-devel \
diff --git a/docker/Dockerfile_fedora_28 b/docker/Dockerfile_fedora_28
index 6c7e44bd..82182802 100644
--- a/docker/Dockerfile_fedora_28
+++ b/docker/Dockerfile_fedora_28
@@ -16,7 +16,6 @@ RUN dnf upgrade -y && \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
- libsamplerate-devel \
libtool \
dbus-devel \
expat-devel \
diff --git a/docker/Dockerfile_ubuntu_14.04 b/docker/Dockerfile_ubuntu_14.04
index 2966b1af..71bde334 100644
--- a/docker/Dockerfile_ubuntu_14.04
+++ b/docker/Dockerfile_ubuntu_14.04
@@ -34,7 +34,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_ubuntu_14.04_i386 b/docker/Dockerfile_ubuntu_14.04_i386
index 37dfcaa3..9a7ceee0 100644
--- a/docker/Dockerfile_ubuntu_14.04_i386
+++ b/docker/Dockerfile_ubuntu_14.04_i386
@@ -34,7 +34,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04
index 8e819fba..57886472 100644
--- a/docker/Dockerfile_ubuntu_16.04
+++ b/docker/Dockerfile_ubuntu_16.04
@@ -34,7 +34,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386
index 813bf276..96728b43 100644
--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ b/docker/Dockerfile_ubuntu_16.04_i386
@@ -34,7 +34,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_ubuntu_16.10 b/docker/Dockerfile_ubuntu_16.10
index 5ebf1874..465702e8 100644
--- a/docker/Dockerfile_ubuntu_16.10
+++ b/docker/Dockerfile_ubuntu_16.10
@@ -44,7 +44,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_ubuntu_16.10_i386 b/docker/Dockerfile_ubuntu_16.10_i386
index 1589e731..f6a70a8c 100644
--- a/docker/Dockerfile_ubuntu_16.10_i386
+++ b/docker/Dockerfile_ubuntu_16.10_i386
@@ -44,7 +44,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_ubuntu_17.04 b/docker/Dockerfile_ubuntu_17.04
index 950ddd4f..fc628685 100644
--- a/docker/Dockerfile_ubuntu_17.04
+++ b/docker/Dockerfile_ubuntu_17.04
@@ -45,7 +45,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386
index adaa8b78..91df20f2 100644
--- a/docker/Dockerfile_ubuntu_17.04_i386
+++ b/docker/Dockerfile_ubuntu_17.04_i386
@@ -45,7 +45,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_ubuntu_17.10 b/docker/Dockerfile_ubuntu_17.10
index b54cd91d..de0437c7 100644
--- a/docker/Dockerfile_ubuntu_17.10
+++ b/docker/Dockerfile_ubuntu_17.10
@@ -45,7 +45,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_ubuntu_17.10_i386 b/docker/Dockerfile_ubuntu_17.10_i386
index b24d8ac2..a585cd13 100644
--- a/docker/Dockerfile_ubuntu_17.10_i386
+++ b/docker/Dockerfile_ubuntu_17.10_i386
@@ -45,7 +45,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_18.04
index eee2992d..5e209161 100644
--- a/docker/Dockerfile_ubuntu_18.04
+++ b/docker/Dockerfile_ubuntu_18.04
@@ -35,7 +35,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/docker/Dockerfile_ubuntu_18.04_i386 b/docker/Dockerfile_ubuntu_18.04_i386
index 7eceb0e9..51813372 100644
--- a/docker/Dockerfile_ubuntu_18.04_i386
+++ b/docker/Dockerfile_ubuntu_18.04_i386
@@ -35,7 +35,6 @@ RUN apt-get update && \
autotools-dev \
gettext \
libpulse-dev \
- libsamplerate0-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
diff --git a/make-ring.py b/make-ring.py
index e1472da1..2b0a3635 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -73,8 +73,8 @@ ZYPPER_DEPENDENCIES = [
'autoconf', 'autoconf-archive', 'automake', 'cmake', 'patch', 'gcc-c++', 'libtool',
# daemon
'speexdsp-devel', 'speex-devel', 'libdbus-c++-devel', 'jsoncpp-devel', 'yaml-cpp-devel',
- 'libupnp-devel', 'boost-devel', 'yasm', 'libuuid-devel', 'libsamplerate-devel',
- 'libnettle-devel', 'libopus-devel', 'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel',
+ 'libupnp-devel', 'boost-devel', 'yasm', 'libuuid-devel', 'libnettle-devel',
+ 'libopus-devel', 'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel',
'libavdevice-devel', 'pcre-devel', 'libogg-devel', 'libvorbis-devel', 'flac-devel',
'libgsm-devel', 'alsa-devel', 'libpulse-devel', 'libudev-devel', 'libva-devel',
'libvdpau-devel', 'libopenssl-devel',
@@ -104,7 +104,7 @@ MINGW32_FEDORA_DEPENDENCIES = [
DNF_DEPENDENCIES = [
'autoconf', 'autoconf-archive', 'automake', 'cmake', 'speexdsp-devel', 'pulseaudio-libs-devel',
- 'libsamplerate-devel', 'libtool', 'dbus-devel', 'expat-devel', 'pcre-devel',
+ 'libtool', 'dbus-devel', 'expat-devel', 'pcre-devel',
'yaml-cpp-devel', 'boost-devel', 'dbus-c++-devel', 'dbus-devel',
'libXext-devel', 'libXfixes-devel', 'yasm',
'speex-devel', 'chrpath', 'check', 'astyle', 'uuid-c++-devel', 'gettext-devel',
@@ -123,7 +123,7 @@ APT_DEPENDENCIES = [
'libclutter-gtk-1.0-dev', 'libcppunit-dev', 'libdbus-1-dev',
'libdbus-c++-dev', 'libebook1.2-dev', 'libexpat1-dev', 'libgnutls28-dev',
'libgsm1-dev', 'libgtk-3-dev', 'libjack-dev', 'libnotify-dev',
- 'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libsamplerate0-dev', 'libssl-dev',
+ 'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libssl-dev',
'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'libqt5sql5-sqlite', 'sip-tester', 'swig',
'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
@@ -133,7 +133,7 @@ APT_DEPENDENCIES = [
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', 'gsm', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse', 'libsamplerate',
+ 'expat', 'gsm', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse',
'speex', 'speexdsp', 'libtool', 'libupnp', 'yaml-cpp', 'qt5-base',
'swig', 'yasm', 'qrencode', 'evolution-data-server', 'make', 'patch', 'pkg-config',
'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau', 'libcanbera', 'openssl'
diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control
index 865dfc1b..9bf46611 100644
--- a/packaging/rules/debian/control
+++ b/packaging/rules/debian/control
@@ -54,7 +54,6 @@ Build-Depends: debhelper (>= 9),
libvdpau-dev,
# other
yasm,
- libsamplerate0-dev
Standards-Version: 4.1.5
Homepage: https://ring.cx
Vcs-Git: https://git.ring.cx/savoirfairelinux/ring-project.git
diff --git a/packaging/rules/fedora/ring.spec b/packaging/rules/fedora/ring.spec
index 7a344e91..f972eef9 100644
--- a/packaging/rules/fedora/ring.spec
+++ b/packaging/rules/fedora/ring.spec
@@ -19,7 +19,6 @@ BuildRequires: automake
BuildRequires: cmake
BuildRequires: pulseaudio-libs-devel
BuildRequires: libcanberra-devel
-BuildRequires: libsamplerate-devel
BuildRequires: libtool
BuildRequires: dbus-devel
BuildRequires: expat-devel
--
GitLab