build: remove sndfile dependency

Change-Id: Ica9cd2730d01da54d39b2be62f327876bff14f3e

build: remove sndfile dependency
Change-Id: Ica9cd2730d01da54d39b2be62f327876bff14f3e
06572184 · Philippe Gorley · 2b199096 · 06572184 · 06572184 · 06572184
Commit 06572184 authored Jul 30, 2018 by Philippe Gorley
30 changed files
--- a/docker/Dockerfile_debian_8
+++ b/docker/Dockerfile_debian_8
@@ -39,7 +39,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_debian_8_i386
+++ b/docker/Dockerfile_debian_8_i386
@@ -39,7 +39,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -40,7 +40,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -40,7 +40,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_fedora_22
+++ b/docker/Dockerfile_fedora_22
@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
        boost-devel \
        dbus-c++-devel \
        dbus-devel \
-        libsndfile-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \

--- a/docker/Dockerfile_fedora_22_i386
+++ b/docker/Dockerfile_fedora_22_i386
@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
        boost-devel \
        dbus-c++-devel \
        dbus-devel \
-        libsndfile-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \

--- a/docker/Dockerfile_fedora_23
+++ b/docker/Dockerfile_fedora_23
@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
        boost-devel \
        dbus-c++-devel \
        dbus-devel \
-        libsndfile-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \

--- a/docker/Dockerfile_fedora_23_i386
+++ b/docker/Dockerfile_fedora_23_i386
@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
        boost-devel \
        dbus-c++-devel \
        dbus-devel \
-        libsndfile-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \

--- a/docker/Dockerfile_fedora_24
+++ b/docker/Dockerfile_fedora_24
@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
        boost-devel \
        dbus-c++-devel \
        dbus-devel \
-        libsndfile-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \

--- a/docker/Dockerfile_fedora_24_i386
+++ b/docker/Dockerfile_fedora_24_i386
@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
        boost-devel \
        dbus-c++-devel \
        dbus-devel \
-        libsndfile-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \

--- a/docker/Dockerfile_fedora_25
+++ b/docker/Dockerfile_fedora_25
@@ -22,7 +22,6 @@ RUN dnf upgrade -y && \
        boost-devel \
        dbus-c++-devel \
        dbus-devel \
-        libsndfile-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \

--- a/docker/Dockerfile_fedora_25_i386
+++ b/docker/Dockerfile_fedora_25_i386
@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
        boost-devel \
        dbus-c++-devel \
        dbus-devel \
-        libsndfile-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \

--- a/docker/Dockerfile_fedora_26
+++ b/docker/Dockerfile_fedora_26
@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
        boost-devel \
        dbus-c++-devel \
        dbus-devel \
-        libsndfile-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \

--- a/docker/Dockerfile_fedora_27
+++ b/docker/Dockerfile_fedora_27
@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
        boost-devel \
        dbus-c++-devel \
        dbus-devel \
-        libsndfile-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \

--- a/docker/Dockerfile_fedora_28
+++ b/docker/Dockerfile_fedora_28
@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
        boost-devel \
        dbus-c++-devel \
        dbus-devel \
-        libsndfile-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \

--- a/docker/Dockerfile_ubuntu_14.04
+++ b/docker/Dockerfile_ubuntu_14.04
@@ -40,7 +40,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_ubuntu_14.04_i386
+++ b/docker/Dockerfile_ubuntu_14.04_i386
@@ -40,7 +40,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_ubuntu_16.04
+++ b/docker/Dockerfile_ubuntu_16.04
@@ -40,7 +40,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ b/docker/Dockerfile_ubuntu_16.04_i386
@@ -40,7 +40,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_ubuntu_16.10
+++ b/docker/Dockerfile_ubuntu_16.10
@@ -50,7 +50,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_ubuntu_16.10_i386
+++ b/docker/Dockerfile_ubuntu_16.10_i386
@@ -50,7 +50,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_ubuntu_17.04
+++ b/docker/Dockerfile_ubuntu_17.04
@@ -51,7 +51,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_ubuntu_17.04_i386
+++ b/docker/Dockerfile_ubuntu_17.04_i386
@@ -51,7 +51,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_ubuntu_17.10
+++ b/docker/Dockerfile_ubuntu_17.10
@@ -51,7 +51,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_ubuntu_17.10_i386
+++ b/docker/Dockerfile_ubuntu_17.10_i386
@@ -51,7 +51,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_ubuntu_18.04
+++ b/docker/Dockerfile_ubuntu_18.04
@@ -41,7 +41,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/docker/Dockerfile_ubuntu_18.04_i386
+++ b/docker/Dockerfile_ubuntu_18.04_i386
@@ -41,7 +41,6 @@ RUN apt-get update && \
        libpcre3-dev \
        libyaml-cpp-dev \
        libboost-dev \
-        libsndfile1-dev \
        libxext-dev \
        libxfixes-dev \
        libspeex-dev \

--- a/make-ring.py
+++ b/make-ring.py
@@ -75,8 +75,8 @@ ZYPPER_DEPENDENCIES = [
    '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',
-    'libavdevice-devel', 'pcre-devel', 'libogg-devel', 'libsndfile-devel', 'libvorbis-devel',
-    'flac-devel', 'libgsm-devel', 'alsa-devel', 'libpulse-devel', 'libudev-devel', 'libva-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',
 # lrc
    'libQt5Core-devel', 'libQt5DBus-devel', 'libqt5-linguist-devel',
@@ -106,7 +106,7 @@ DNF_DEPENDENCIES = [
    'autoconf', 'autoconf-archive', 'automake', 'cmake', 'speexdsp-devel', 'pulseaudio-libs-devel',
    'libsamplerate-devel', 'libtool', 'dbus-devel', 'expat-devel', 'pcre-devel',
    'yaml-cpp-devel', 'boost-devel', 'dbus-c++-devel', 'dbus-devel',
-    'libsndfile-devel', 'libXext-devel', 'libXfixes-devel', 'yasm',
+    'libXext-devel', 'libXfixes-devel', 'yasm',
    'speex-devel', 'chrpath', 'check', 'astyle', 'uuid-c++-devel', 'gettext-devel',
    'gcc-c++', 'which', 'alsa-lib-devel', 'systemd-devel', 'libuuid-devel',
    'uuid-devel', 'gnutls-devel', 'nettle-devel', 'opus-devel', 'speexdsp-devel',
@@ -124,7 +124,7 @@ APT_DEPENDENCIES = [
    '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',
-    'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
+    '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',
    'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-dev', 'libvdpau-dev', 'libmsgpack-dev', 'libcanberra-gtk3-dev'
@@ -134,7 +134,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', 'gsm', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse', 'libsamplerate',
-    'libsndfile', 'speex', 'speexdsp', 'libtool', 'libupnp', 'yaml-cpp', 'qt5-base',
+    '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
@@ -34,7 +34,6 @@ Build-Depends: debhelper (>= 9),
               libpcre3-dev,
               libyaml-cpp-dev,
               libboost-dev,
-               libsndfile1-dev,
               libxext-dev,
               libxfixes-dev,
               libspeex-dev,

--- a/packaging/rules/fedora/ring.spec
+++ b/packaging/rules/fedora/ring.spec
@@ -28,7 +28,6 @@ BuildRequires: yaml-cpp-devel
 BuildRequires: boost-devel
 BuildRequires: dbus-c++-devel
 BuildRequires: dbus-devel
-BuildRequires: libsndfile-devel
 BuildRequires: libXext-devel
 BuildRequires: yasm
 BuildRequires: speex-devel