From dede5044487b867fc3e111d3d85cbbe6b661f518 Mon Sep 17 00:00:00 2001
From: Iain Holmes <iain@prettypeople.org>
Date: Fri, 12 Nov 2004 15:04:55 +0000
Subject: [PATCH] Added the polypaudio sink and hooked it into the build
 system.

Original commit message from CVS:
Added the polypaudio sink and hooked it into the build system.
---
 ChangeLog       | 13 +++++++++++++
 configure.ac    | 11 +++++++++++
 ext/Makefile.am |  8 ++++++++
 3 files changed, 32 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 93896ba584..25550c9332 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-11-12 Iain <iaingnome@gmail.com>
+
+	* configure.ac: Check for polypaudio
+
+	* ext/Makefile.am: Build the polyp dir
+
+	* ext/polyp: The polypsink sources.
+
+2004-10-30 Iain <iaingnome@gmail.com>
+
+	* gst/interleave/interleave.c (interleave_unlink): Change the src pads
+	caps to reflect the new number of channels.
+
 2004-11-12  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/alsa/gstalsasink.c: (gst_alsa_sink_loop):
diff --git a/configure.ac b/configure.ac
index a69a2bcd61..239dd9ee6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1411,6 +1411,15 @@ GST_CHECK_FEATURE(PANGO, [pango], pango, [
   AC_SUBST(PANGO_LIBS)
 ])
 
+dnl *** polypaudio ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_POLYP, true)
+GST_CHECK_FEATURE(POLYP, [polyp], polyp, [
+  PKG_CHECK_MODULES(POLYP, polyplib >= 0.6,
+      HAVE_POLYP="yes", HAVE_POLYP="no")
+  AC_SUBST(POLYP_CFLAGS)
+  AC_SUBST(POLYP_CFLAGS)
+])
+
 dnl *** dv1394 ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_DV1394, true)
 GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], dv1394src, [
@@ -1970,6 +1979,7 @@ ext/musicbrainz/Makefile
 ext/nas/Makefile
 ext/ogg/Makefile
 ext/pango/Makefile
+ext/polyp/Makefile
 ext/raw1394/Makefile
 ext/sdl/Makefile
 ext/shout/Makefile
@@ -1988,6 +1998,7 @@ ext/xvid/Makefile
 gst-libs/Makefile
 gst-libs/gst/Makefile
 gst-libs/gst/audio/Makefile
+gst-libs/gst/cache/Makefile
 gst-libs/gst/colorbalance/Makefile
 gst-libs/gst/floatcast/Makefile
 gst-libs/gst/gconf/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 311a320933..7f3b6fc9f7 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -190,6 +190,12 @@ else
 LIBPNG_DIR=
 endif
 
+if USE_POLYP
+POLYP_DIR=polyp
+else
+POLYP_DIR=
+endif
+
 if USE_LIBRFB
 LIBRFB_DIR=librfb
 else
@@ -409,6 +415,7 @@ SUBDIRS=\
 	$(MUSICBRAINZ_DIR) \
 	$(OGG_DIR) \
 	$(PANGO_DIR) \
+	$(POLYP_DIR) \
 	$(SDL_DIR) \
 	$(SHOUT_DIR) \
 	$(SHOUT2_DIR) \
@@ -470,6 +477,7 @@ DIST_SUBDIRS=\
 	nas \
 	ogg \
 	pango \
+	polyp \
 	raw1394 \
 	sdl \
 	snapshot \