diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8 index 232b03d392ddb8af2846e0b9ea6f837debaf4d03..6ee725606435f8ca33b5a17c5af05c786168b6c8 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 b992fb954c860f96e7a57a0a1cd014f0587251d7..c9d09f97025d9dc58141889e0198ea15d64e1505 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 8d2f2ebebc9e07bf388eba3aa6a43e8d38b8086c..f72ae0b0a348d789d132bf4df03872dcfb096452 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 679b5dc972fa6b09f2465e03b487416963d1574e..6527eab98fc7e2d678add4db823f44949620ce8f 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 23d776f985dcf144374e439d845fcb901298daf3..1de9fec3c614262e7fc0f253102bccc42303481f 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 b8811319df1a08739df939eb5552c4fbca97381b..1559a91bc136258230ecda19a68ba283aef24fed 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 ac5a6fb4534d42875904cd1506fe0de55e466676..efb86d446da18684e2bf0c3f663ff250a9124239 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 34c5b8007d48f6d7500251dffec688b3af44400c..52e7f90347f26aff3eaf332c8232e8544f653ce8 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 c201db0565ff6ee961b4b2538cc88667101480e7..7fd6ad15b7e47e49554a2398ee67e5f40fac0364 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 1d10d3b57e7135b57f2a3537a00599f345f3f996..20f83f897959b53dfd3bb288380c8f9a8f676885 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 b83ae7bdd5ee715b59672403976fe304d4a6d741..62e89a4e2bd874e2aec147e40c208fd4a0bb7739 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 99b49e974d0d60193380ba66f9d3c610ecc9302f..f1b2b0c3b297028d617ffdb59de53bbc03b491bc 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 7c08bfdaf66e1554d9316ae8ecaaad26071cffb2..f3b87a6fbc14dbec792b0380924e0f31c4b89503 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 27156bb1ad7f6f486178f2863f4f20ef3d03b166..e7558220118a8dd8e9a0c2b5a297c123c3cde9fe 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 6c7e44bd0f2fcc9460da726f1011b5c65a294686..82182802fd1f480dc26be9af36db94919f05d086 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 2966b1affc0b54b18ae8a06e6d0610ab78eb6aaf..71bde334345d8c3d6d4eda5855df6e1e6fc6a077 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 37dfcaa3e9cd989369d842b01c6dd1cacead75dd..9a7ceee0b49d234bb6ad0a709df1a575492c67f2 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 8e819fba0162314c81513bd19800466f43c3d252..57886472695bb0d353030eb497a8aff89fe95daf 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 813bf27671f18f83f0e5979523b5412c7deaa165..96728b43d60dd12a92cf60e173c2c8efd44945ad 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 5ebf1874dc3fb692169d06553d20d12a8f64ce42..465702e89c4c4e8a449210d491b9008b2638e708 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 1589e731437db439362dbe277615b92bea300eef..f6a70a8c4596b0c160e022afa12c74447b5ce8ac 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 950ddd4f73f74f8dc4a4f9957c02663d5ac8ed7a..fc628685a65fc95eb422010c7869bd22d83bf8ca 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 adaa8b78a47f7e856d822307baa09e478c73bd08..91df20f22017aa54ed21da430fbce959124a8f96 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 b54cd91dc8e864f0f17ac02d67cbd127b799f3db..de0437c724116832ee4af99fac640c7e0ef073d9 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 b24d8ac2bf47d877c0ca7bc7be062e035b8c7cef..a585cd130bbd15f9de2710741cca05283ce6dcd3 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 eee2992d311016905e7ffeb97ff08c97a984f978..5e209161a29f1ebab4e8b18220eeb66e57fba111 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 7eceb0e9e6dadfa06080c84d58f89aa77c250ec8..518133724f7beb59f473936ca4b3a7241680c9c9 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 e1472da105d1a29f99f773000008933ba6f1da3f..2b0a3635ee3cafb1b76186707bd1c0119fc6ccd2 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 865dfc1bf5aa890937dfd770d47e8f91cf7d608d..9bf466118396d800cbcef5153054ae73b3c5e106 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 7a344e9132a43f296ee3ab21af864071d0d296e5..f972eef92e348041e21026266347c93f04bd4962 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