Commit 06572184 authored by Philippe Gorley's avatar Philippe Gorley

build: remove sndfile dependency

Change-Id: Ica9cd2730d01da54d39b2be62f327876bff14f3e
parent 2b199096
...@@ -39,7 +39,6 @@ RUN apt-get update && \ ...@@ -39,7 +39,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -39,7 +39,6 @@ RUN apt-get update && \ ...@@ -39,7 +39,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -40,7 +40,6 @@ RUN apt-get update && \ ...@@ -40,7 +40,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -40,7 +40,6 @@ RUN apt-get update && \ ...@@ -40,7 +40,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \ ...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
boost-devel \ boost-devel \
dbus-c++-devel \ dbus-c++-devel \
dbus-devel \ dbus-devel \
libsndfile-devel \
libXext-devel \ libXext-devel \
libXfixes-devel \ libXfixes-devel \
yasm \ yasm \
......
...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \ ...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
boost-devel \ boost-devel \
dbus-c++-devel \ dbus-c++-devel \
dbus-devel \ dbus-devel \
libsndfile-devel \
libXext-devel \ libXext-devel \
libXfixes-devel \ libXfixes-devel \
yasm \ yasm \
......
...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \ ...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
boost-devel \ boost-devel \
dbus-c++-devel \ dbus-c++-devel \
dbus-devel \ dbus-devel \
libsndfile-devel \
libXext-devel \ libXext-devel \
libXfixes-devel \ libXfixes-devel \
yasm \ yasm \
......
...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \ ...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
boost-devel \ boost-devel \
dbus-c++-devel \ dbus-c++-devel \
dbus-devel \ dbus-devel \
libsndfile-devel \
libXext-devel \ libXext-devel \
libXfixes-devel \ libXfixes-devel \
yasm \ yasm \
......
...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \ ...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
boost-devel \ boost-devel \
dbus-c++-devel \ dbus-c++-devel \
dbus-devel \ dbus-devel \
libsndfile-devel \
libXext-devel \ libXext-devel \
libXfixes-devel \ libXfixes-devel \
yasm \ yasm \
......
...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \ ...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
boost-devel \ boost-devel \
dbus-c++-devel \ dbus-c++-devel \
dbus-devel \ dbus-devel \
libsndfile-devel \
libXext-devel \ libXext-devel \
libXfixes-devel \ libXfixes-devel \
yasm \ yasm \
......
...@@ -22,7 +22,6 @@ RUN dnf upgrade -y && \ ...@@ -22,7 +22,6 @@ RUN dnf upgrade -y && \
boost-devel \ boost-devel \
dbus-c++-devel \ dbus-c++-devel \
dbus-devel \ dbus-devel \
libsndfile-devel \
libXext-devel \ libXext-devel \
libXfixes-devel \ libXfixes-devel \
yasm \ yasm \
......
...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \ ...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
boost-devel \ boost-devel \
dbus-c++-devel \ dbus-c++-devel \
dbus-devel \ dbus-devel \
libsndfile-devel \
libXext-devel \ libXext-devel \
libXfixes-devel \ libXfixes-devel \
yasm \ yasm \
......
...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \ ...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
boost-devel \ boost-devel \
dbus-c++-devel \ dbus-c++-devel \
dbus-devel \ dbus-devel \
libsndfile-devel \
libXext-devel \ libXext-devel \
libXfixes-devel \ libXfixes-devel \
yasm \ yasm \
......
...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \ ...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
boost-devel \ boost-devel \
dbus-c++-devel \ dbus-c++-devel \
dbus-devel \ dbus-devel \
libsndfile-devel \
libXext-devel \ libXext-devel \
libXfixes-devel \ libXfixes-devel \
yasm \ yasm \
......
...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \ ...@@ -25,7 +25,6 @@ RUN dnf upgrade -y && \
boost-devel \ boost-devel \
dbus-c++-devel \ dbus-c++-devel \
dbus-devel \ dbus-devel \
libsndfile-devel \
libXext-devel \ libXext-devel \
libXfixes-devel \ libXfixes-devel \
yasm \ yasm \
......
...@@ -40,7 +40,6 @@ RUN apt-get update && \ ...@@ -40,7 +40,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -40,7 +40,6 @@ RUN apt-get update && \ ...@@ -40,7 +40,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -40,7 +40,6 @@ RUN apt-get update && \ ...@@ -40,7 +40,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -40,7 +40,6 @@ RUN apt-get update && \ ...@@ -40,7 +40,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -50,7 +50,6 @@ RUN apt-get update && \ ...@@ -50,7 +50,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -50,7 +50,6 @@ RUN apt-get update && \ ...@@ -50,7 +50,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -51,7 +51,6 @@ RUN apt-get update && \ ...@@ -51,7 +51,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -51,7 +51,6 @@ RUN apt-get update && \ ...@@ -51,7 +51,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -51,7 +51,6 @@ RUN apt-get update && \ ...@@ -51,7 +51,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -51,7 +51,6 @@ RUN apt-get update && \ ...@@ -51,7 +51,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -41,7 +41,6 @@ RUN apt-get update && \ ...@@ -41,7 +41,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -41,7 +41,6 @@ RUN apt-get update && \ ...@@ -41,7 +41,6 @@ RUN apt-get update && \
libpcre3-dev \ libpcre3-dev \
libyaml-cpp-dev \ libyaml-cpp-dev \
libboost-dev \ libboost-dev \
libsndfile1-dev \
libxext-dev \ libxext-dev \
libxfixes-dev \ libxfixes-dev \
libspeex-dev \ libspeex-dev \
......
...@@ -75,8 +75,8 @@ ZYPPER_DEPENDENCIES = [ ...@@ -75,8 +75,8 @@ ZYPPER_DEPENDENCIES = [
'speexdsp-devel', 'speex-devel', 'libdbus-c++-devel', 'jsoncpp-devel', 'yaml-cpp-devel', 'speexdsp-devel', 'speex-devel', 'libdbus-c++-devel', 'jsoncpp-devel', 'yaml-cpp-devel',
'libupnp-devel', 'boost-devel', 'yasm', 'libuuid-devel', 'libsamplerate-devel', 'libupnp-devel', 'boost-devel', 'yasm', 'libuuid-devel', 'libsamplerate-devel',
'libnettle-devel', 'libopus-devel', 'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel', 'libnettle-devel', 'libopus-devel', 'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel',
'libavdevice-devel', 'pcre-devel', 'libogg-devel', 'libsndfile-devel', 'libvorbis-devel', 'libavdevice-devel', 'pcre-devel', 'libogg-devel', 'libvorbis-devel', 'flac-devel',
'flac-devel', 'libgsm-devel', 'alsa-devel', 'libpulse-devel', 'libudev-devel', 'libva-devel', 'libgsm-devel', 'alsa-devel', 'libpulse-devel', 'libudev-devel', 'libva-devel',
'libvdpau-devel', 'libopenssl-devel', 'libvdpau-devel', 'libopenssl-devel',
# lrc # lrc
'libQt5Core-devel', 'libQt5DBus-devel', 'libqt5-linguist-devel', 'libQt5Core-devel', 'libQt5DBus-devel', 'libqt5-linguist-devel',
...@@ -106,7 +106,7 @@ DNF_DEPENDENCIES = [ ...@@ -106,7 +106,7 @@ DNF_DEPENDENCIES = [
'autoconf', 'autoconf-archive', 'automake', 'cmake', 'speexdsp-devel', 'pulseaudio-libs-devel', 'autoconf', 'autoconf-archive', 'automake', 'cmake', 'speexdsp-devel', 'pulseaudio-libs-devel',
'libsamplerate-devel', 'libtool', 'dbus-devel', 'expat-devel', 'pcre-devel', 'libsamplerate-devel', 'libtool', 'dbus-devel', 'expat-devel', 'pcre-devel',
'yaml-cpp-devel', 'boost-devel', 'dbus-c++-devel', 'dbus-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', 'speex-devel', 'chrpath', 'check', 'astyle', 'uuid-c++-devel', 'gettext-devel',
'gcc-c++', 'which', 'alsa-lib-devel', 'systemd-devel', 'libuuid-devel', 'gcc-c++', 'which', 'alsa-lib-devel', 'systemd-devel', 'libuuid-devel',
'uuid-devel', 'gnutls-devel', 'nettle-devel', 'opus-devel', 'speexdsp-devel', 'uuid-devel', 'gnutls-devel', 'nettle-devel', 'opus-devel', 'speexdsp-devel',
...@@ -124,7 +124,7 @@ APT_DEPENDENCIES = [ ...@@ -124,7 +124,7 @@ APT_DEPENDENCIES = [
'libdbus-c++-dev', 'libebook1.2-dev', 'libexpat1-dev', 'libgnutls28-dev', 'libdbus-c++-dev', 'libebook1.2-dev', 'libexpat1-dev', 'libgnutls28-dev',
'libgsm1-dev', 'libgtk-3-dev', 'libjack-dev', 'libnotify-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', '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', 'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'libqt5sql5-sqlite', 'sip-tester', 'swig',
'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev', 'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-dev', 'libvdpau-dev', 'libmsgpack-dev', 'libcanberra-gtk3-dev' 'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-dev', 'libvdpau-dev', 'libmsgpack-dev', 'libcanberra-gtk3-dev'
...@@ -134,7 +134,7 @@ PACMAN_DEPENDENCIES = [ ...@@ -134,7 +134,7 @@ PACMAN_DEPENDENCIES = [
'autoconf', 'autoconf-archive', 'gettext', 'cmake', 'dbus', 'doxygen', 'gcc', 'gnome-icon-theme-symbolic', 'autoconf', 'autoconf-archive', 'gettext', 'cmake', 'dbus', 'doxygen', 'gcc', 'gnome-icon-theme-symbolic',
'ffmpeg', 'boost', 'clutter-gtk', 'cppunit', 'libdbus', 'dbus-c++', 'libe-book', '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', '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', 'swig', 'yasm', 'qrencode', 'evolution-data-server', 'make', 'patch', 'pkg-config',
'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau', 'libcanbera', 'openssl' 'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau', 'libcanbera', 'openssl'
] ]
......
...@@ -34,7 +34,6 @@ Build-Depends: debhelper (>= 9), ...@@ -34,7 +34,6 @@ Build-Depends: debhelper (>= 9),
libpcre3-dev, libpcre3-dev,
libyaml-cpp-dev, libyaml-cpp-dev,
libboost-dev, libboost-dev,
libsndfile1-dev,
libxext-dev, libxext-dev,
libxfixes-dev, libxfixes-dev,
libspeex-dev, libspeex-dev,
......
...@@ -28,7 +28,6 @@ BuildRequires: yaml-cpp-devel ...@@ -28,7 +28,6 @@ BuildRequires: yaml-cpp-devel
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: dbus-c++-devel BuildRequires: dbus-c++-devel
BuildRequires: dbus-devel BuildRequires: dbus-devel
BuildRequires: libsndfile-devel
BuildRequires: libXext-devel BuildRequires: libXext-devel
BuildRequires: yasm BuildRequires: yasm
BuildRequires: speex-devel BuildRequires: speex-devel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment