diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-21 08:34:35 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-21 08:34:35 +0100 |
| commit | fd88ee34fa5f069412ec9572407babafb74d6554 (patch) | |
| tree | 764dffa7a25d192f368fb48eb5606d85d35a0e79 /package/pulseaudio | |
| parent | e7fbbc95bc3a73e938d7c0159978a73ee7c3d22a (diff) | |
| parent | 1a3b09a9daae7dc8e116900f2a45a5d6f0bd12f0 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/pulseaudio')
| -rw-r--r-- | package/pulseaudio/Makefile | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index e7d71a48d..eba650096 100644 --- a/package/pulseaudio/Makefile +++ b/package/pulseaudio/Makefile @@ -11,9 +11,10 @@ PKG_DESCR:= a sound system for POSIX OSes PKG_SECTION:= multimedia PKG_DEPENDS:= libltdl json-c libsndfile libudev libspeex libncurses PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile dbus -PKG_DEPENDS+= libgcc libpthread librt alsa-lib +PKG_DEPENDS+= libgcc libpthread librt alsa-lib libsamplerate PKG_BUILDDEP:= libtool json-c libsndfile eudev speex libsndfile PKG_BUILDDEP+= flac libvorbis libogg util-linux dbus ncurses alsa-lib +PKG_BUILDDEP+= libsamplerate PKG_URL:= http://www.freedesktop.org/wiki/Software/PulseAudio/ PKG_SITES:= http://freedesktop.org/software/pulseaudio/releases/ PKG_OPTS:= dev @@ -31,7 +32,16 @@ CONFIGURE_ARGS+= --disable-systemd \ --disable-manpages \ --disable-neon-opt \ --disable-x11 \ + --disable-avahi \ + --disable-lirc \ --disable-openssl \ + --disable-orc \ + --disable-libwrap \ + --disable-oss \ + --disable-esound \ + --disable-jack \ + --disable-gconf \ + --enable-samplerate \ --enable-alsa \ --enable-dbus \ --enable-udev \ |