diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8 index 82e9cff6c685f43feac5c1a511b594c326bf6a59..232b03d392ddb8af2846e0b9ea6f837debaf4d03 100644 --- 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 \ diff --git a/docker/Dockerfile_debian_8_i386 b/docker/Dockerfile_debian_8_i386 index 3115922070c2f321bec11fa2b87bd6a501de66c0..b992fb954c860f96e7a57a0a1cd014f0587251d7 100644 --- 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 \ diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9 index 593669f4eae2f53e2e4ac04fd484102bd78960e3..8d2f2ebebc9e07bf388eba3aa6a43e8d38b8086c 100644 --- 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 \ diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386 index 04fd65c538d9351462999bb7d6a0c84085973331..679b5dc972fa6b09f2465e03b487416963d1574e 100644 --- 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 \ diff --git a/docker/Dockerfile_fedora_22 b/docker/Dockerfile_fedora_22 index b4067fc6aa76a003b733964f9a4ab49c14da98ad..23d776f985dcf144374e439d845fcb901298daf3 100644 --- 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 \ diff --git a/docker/Dockerfile_fedora_22_i386 b/docker/Dockerfile_fedora_22_i386 index 4e898bf85c5c0e60bc4ee18a3200b014fbf45004..b8811319df1a08739df939eb5552c4fbca97381b 100644 --- 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 \ diff --git a/docker/Dockerfile_fedora_23 b/docker/Dockerfile_fedora_23 index 84deee95d332120e39eb866bd13a159205fff3b9..ac5a6fb4534d42875904cd1506fe0de55e466676 100644 --- 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 \ diff --git a/docker/Dockerfile_fedora_23_i386 b/docker/Dockerfile_fedora_23_i386 index b6fa670779c37a0791833f0be2f2c9f234d44849..34c5b8007d48f6d7500251dffec688b3af44400c 100644 --- 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 \ diff --git a/docker/Dockerfile_fedora_24 b/docker/Dockerfile_fedora_24 index 18521d57d89598476c7f9970bc76ea0b5ade5363..c201db0565ff6ee961b4b2538cc88667101480e7 100644 --- 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 \ diff --git a/docker/Dockerfile_fedora_24_i386 b/docker/Dockerfile_fedora_24_i386 index 6bcf8ad7a8e3dfc282c56e2e34e93fad12c56d10..1d10d3b57e7135b57f2a3537a00599f345f3f996 100644 --- 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 \ diff --git a/docker/Dockerfile_fedora_25 b/docker/Dockerfile_fedora_25 index 04100b6b3b5127800e3f59394a6f51175529ef04..b83ae7bdd5ee715b59672403976fe304d4a6d741 100644 --- 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 \ diff --git a/docker/Dockerfile_fedora_25_i386 b/docker/Dockerfile_fedora_25_i386 index 311bb43b628c837686e8ff3208fbc22daba6981d..99b49e974d0d60193380ba66f9d3c610ecc9302f 100644 --- 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 \ diff --git a/docker/Dockerfile_fedora_26 b/docker/Dockerfile_fedora_26 index fa4e49e47f8c7c53011346f5f8e9887fe7ad879f..7c08bfdaf66e1554d9316ae8ecaaad26071cffb2 100644 --- 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 \ diff --git a/docker/Dockerfile_fedora_27 b/docker/Dockerfile_fedora_27 index 8103a295ddf0eae340c279b05bb8bb7acb6e4203..27156bb1ad7f6f486178f2863f4f20ef3d03b166 100644 --- 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 \ diff --git a/docker/Dockerfile_fedora_28 b/docker/Dockerfile_fedora_28 index f1b577234675cae851eb3ff9f0a423bd7bf3699e..6c7e44bd0f2fcc9460da726f1011b5c65a294686 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_14.04 b/docker/Dockerfile_ubuntu_14.04 index 201f9452c8963e150333545b6b890aa42bbcfb98..2966b1affc0b54b18ae8a06e6d0610ab78eb6aaf 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_14.04_i386 b/docker/Dockerfile_ubuntu_14.04_i386 index 46cc2e953d87a5d2d68631e6b665c56fe3364b5e..37dfcaa3e9cd989369d842b01c6dd1cacead75dd 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04 index e8971775011bf5b943474b0e6c6c5d4009f21032..8e819fba0162314c81513bd19800466f43c3d252 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386 index 25b3e50fd58497f723b24bd1b1fa1cef9133e980..813bf27671f18f83f0e5979523b5412c7deaa165 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_16.10 b/docker/Dockerfile_ubuntu_16.10 index d94e7bb132621d631ccd7e273ff2412cbb934d7b..5ebf1874dc3fb692169d06553d20d12a8f64ce42 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_16.10_i386 b/docker/Dockerfile_ubuntu_16.10_i386 index 75f26cb6b5b3d5c05ba547086d27e1c04420b981..1589e731437db439362dbe277615b92bea300eef 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_17.04 b/docker/Dockerfile_ubuntu_17.04 index eb3be15ce2ef0b61d2d94e2f8b758b4d631f7c08..950ddd4f73f74f8dc4a4f9957c02663d5ac8ed7a 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386 index 6c68f8571079319be3424e913ad3ec4a99d02d48..adaa8b78a47f7e856d822307baa09e478c73bd08 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_17.10 b/docker/Dockerfile_ubuntu_17.10 index 4534e2d04d67dccccf61df4c2f3d9fd8c5966151..b54cd91dc8e864f0f17ac02d67cbd127b799f3db 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_17.10_i386 b/docker/Dockerfile_ubuntu_17.10_i386 index 0bc6a1d87f1ba70cd93e521db17c28564aef0b5c..b24d8ac2bf47d877c0ca7bc7be062e035b8c7cef 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_18.04 index 5bdbacb0ce7344716ea92f6557ba8ad0255924dc..eee2992d311016905e7ffeb97ff08c97a984f978 100644 --- 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 \ diff --git a/docker/Dockerfile_ubuntu_18.04_i386 b/docker/Dockerfile_ubuntu_18.04_i386 index be936244e647de2fc2554a4fad7f2f29e33f090f..7eceb0e9e6dadfa06080c84d58f89aa77c250ec8 100644 --- 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 \ diff --git a/make-ring.py b/make-ring.py index 16a4cb8ecb48f4e717b954d694b4b74ef5df158a..e1472da105d1a29f99f773000008933ba6f1da3f 100755 --- 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' ] diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control index 466c52a534a328a128d9158d345f1b6816945648..865dfc1bf5aa890937dfd770d47e8f91cf7d608d 100644 --- 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, diff --git a/packaging/rules/fedora/ring.spec b/packaging/rules/fedora/ring.spec index 6e9c2c13d4546bee289fdfe1704f63be2441c3f5..7a344e9132a43f296ee3ab21af864071d0d296e5 100644 --- 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