summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schaller <uraeus@gnome.org>2004-12-12 12:05:38 +0000
committerChristian Schaller <uraeus@gnome.org>2004-12-12 12:05:38 +0000
commitfd1a08e15fea8cc95610449fdd6a74f681900ba1 (patch)
tree7670d5e2747100ec9f21fa6258f07f0019b4531a
parent056c1be37a8c6e38412afabcdda667483ae67dd3 (diff)
merge patch from 158258
Original commit message from CVS: merge patch from 158258
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b2615bfd..98504335 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-12 Christian Fredrik Kalager Schaller <christian at fluendo dot com>
+
+ * configure.ac: Update polyaudio requirement to 0.7
+ * ext/polyp/polypsink.c: (create_stream): add patch from iain (158258)
+
2004-12-11 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* gst/interleave/deinterleave.c:
diff --git a/configure.ac b/configure.ac
index 44b25d8d..2d64fbec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1429,7 +1429,7 @@ GST_CHECK_FEATURE(PANGO, [pango], pango, [
dnl *** polypaudio ***
translit(dnm, m, l) AM_CONDITIONAL(USE_POLYP, true)
GST_CHECK_FEATURE(POLYP, [polyp], polyp, [
- PKG_CHECK_MODULES(POLYP, polyplib >= 0.6,
+ PKG_CHECK_MODULES(POLYP, polyplib >= 0.7,
HAVE_POLYP="yes", HAVE_POLYP="no")
AC_SUBST(POLYP_CFLAGS)
AC_SUBST(POLYP_CFLAGS)