From 5cd650e535068fbd115c1f26bf8a28281134ee1f Mon Sep 17 00:00:00 2001 Message-Id: <5cd650e535068fbd115c1f26bf8a28281134ee1f.1714895328.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 28 Oct 2013 19:47:14 +0000 Subject: [PATCH] Remove now-redundant libao dependency. Organization: Straylight/Edgeware From: Richard Kettlewell --- README | 1 - README.developers | 4 ++-- configure.ac | 3 --- debian/control | 2 +- server/Makefile.am | 2 +- server/play.c | 1 - 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/README b/README index 71176aa..eba453a 100644 --- a/README +++ b/README @@ -31,7 +31,6 @@ Build dependencies: libpcre 7.6 need UTF-8 support libmad 0.15.1b libgcrypt 1.4.1 - libao 0.8.8 1.0.0 is broken libasound 1.0.16 libFLAC 1.2.1 libsamplerate 0.1.4 currently optional diff --git a/README.developers b/README.developers index 692dd12..0f9809b 100644 --- a/README.developers +++ b/README.developers @@ -11,13 +11,13 @@ Dependencies: apt-get install gcc libc6-dev automake autoconf libtool libgtk2.0-dev \ libgc-dev libgcrypt-dev libpcre3-dev libvorbis-dev \ - libao-dev libmad0-dev libasound2-dev libdb4.5-dev \ + libmad0-dev libasound2-dev libdb4.5-dev \ libflac-dev vorbis-tools wget libsamplerate0-dev libdb4.6 does not work (and configure will refuse to use it). * On FreeBSD you'll need at least these packages: - autotools bash flac mad boehm-gc db43 gmake gsed libao libgcrypt wget + autotools bash flac mad boehm-gc db43 gmake gsed libgcrypt wget vorbis-tools * On OS X with Fink: diff --git a/configure.ac b/configure.ac index 7346ec2..37ef7cc 100644 --- a/configure.ac +++ b/configure.ac @@ -462,9 +462,6 @@ if test $want_server = yes; then AC_CHECK_LIB(mad, mad_stream_init, [AC_SUBST(LIBMAD,[-lmad])], [missing_libraries="$missing_libraries libmad"]) - AC_CHECK_LIB([ao], [ao_initialize], - [AC_SUBST(LIBAO,[-lao])], - [missing_libraries="$missing_libraries libao"]) AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_new], [AC_SUBST(LIBFLAC,[-lFLAC])], [missing_libraries="$missing_libraries libFLAC"]) diff --git a/debian/control b/debian/control index 9c2ef37..d472a0e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Richard Kettlewell Section: sound Priority: optional Standards-Version: 3.8.1.0 -Build-Depends: libgc6-dev | libgc-dev, libgcrypt-dev, libdb4.3-dev | libdb4.5-dev | libdb4.7-dev | libdb4.8-dev | libdb5.1-dev, libpcre3-dev, libvorbis-dev, libmad0-dev, libasound2-dev, libao-dev, python, libflac-dev, libgtk2.0-dev (>= 2.12.12) +Build-Depends: libgc6-dev | libgc-dev, libgcrypt-dev, libdb4.3-dev | libdb4.5-dev | libdb4.7-dev | libdb4.8-dev | libdb5.1-dev, libpcre3-dev, libvorbis-dev, libmad0-dev, libasound2-dev, python, libflac-dev, libgtk2.0-dev (>= 2.12.12) Vcs-Git: https://code.google.com/p/disorder/ Homepage: http://www.greenend.org.uk/rjk/disorder/ diff --git a/server/Makefile.am b/server/Makefile.am index c6febdc..8233cff 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -28,7 +28,7 @@ disorderd_SOURCES=disorderd.c api.c api-server.c daemonize.c play.c \ schedule.c dbparams.c background.c mount.c \ exports.c ../lib/memgc.c disorder-server.h disorderd_LDADD=$(LIBOBJS) ../lib/libdisorder.a \ - $(LIBPCRE) $(LIBDB) $(LIBAO) $(LIBGC) $(LIBGCRYPT) $(LIBICONV) \ + $(LIBPCRE) $(LIBDB) $(LIBGC) $(LIBGCRYPT) $(LIBICONV) \ $(LIBASOUND) $(COREAUDIO) $(LIBPTHREAD) $(LIBDL) disorderd_LDFLAGS=-export-dynamic disorderd_DEPENDENCIES=../lib/libdisorder.a diff --git a/server/play.c b/server/play.c index 96e4a50..71782de 100644 --- a/server/play.c +++ b/server/play.c @@ -22,7 +22,6 @@ */ #include "disorder-server.h" -#include #define SPEAKER "disorder-speaker" -- [mdw]