build: remove libsamplerate dependency

Change-Id: Icaeb11be9dd76c815150ec29ebad9cf0534a2144

build: remove libsamplerate dependency
Change-Id: Icaeb11be9dd76c815150ec29ebad9cf0534a2144
ae00a7dd · Philippe Gorley · 06572184 · ae00a7dd · ae00a7dd · ae00a7dd
Commit ae00a7dd authored Jul 31, 2018 by Philippe Gorley
30 changed files
--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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'

--- 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

--- 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