[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-179-gc9375aa

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  0ff2a6b434dec1a694f4cde64469ca19d97d9897 (commit)

- Log -----------------------------------------------------------------
c9375aa libpulse: add missing includes
e5ac4b5 buil-sys: fix build w/o DBus
-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am                |   13 +++++++++----
 src/pulse/ext-stream-restore.h |    2 ++
 src/pulse/stream.h             |    2 ++
 3 files changed, 13 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------

commit e5ac4b5ee738c1e766a250b85854fa3b9c1a70ed
Author: Daniel Mack <daniel at caiaq.de>
Date:   Thu Oct 8 08:45:34 2009 +0200

    buil-sys: fix build w/o DBus
    
    The current git head does not build without DBus libraries installed.
    Does the patch below look suitable?
    
    Thanks,
    Daniel
    
    >From f69145fc603c56cef02134ceeba10e1727fa217e Mon Sep 17 00:00:00 2001
    From: Daniel Mack <daniel at caiaq.de>
    Date: Thu, 8 Oct 2009 14:41:21 +0800
    Subject: [PATCH] Makefile.am: fix builds without DBus
    
    Signed-off-by: Daniel Mack <daniel at caiaq.de>

diff --git a/src/Makefile.am b/src/Makefile.am
index c5d3ab7..98c0468 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -180,14 +180,19 @@ pulseaudio_SOURCES = \
 		daemon/daemon-conf.c daemon/daemon-conf.h \
 		daemon/dumpmodules.c daemon/dumpmodules.h \
 		daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h \
-		daemon/main.c \
-		daemon/server-lookup.c daemon/server-lookup.h
+		daemon/main.c
 
-pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(DBUS_CFLAGS)
-pulseaudio_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(DBUS_LIBS)
+pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS)
+pulseaudio_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS)
 # This is needed because automake doesn't properly expand the foreach below
 pulseaudio_DEPENDENCIES = libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la $(PREOPEN_LIBS)
 
+if HAVE_DBUS
+pulseaudio_CFLAGS += $(DBUS_CFLAGS)
+pulseaudio_SOURCES += daemon/server-lookup.c daemon/server-lookup.h
+pulseaudio_LDADD += $(DBUS_LIBS)
+endif
+
 if PREOPEN_MODS
 PREOPEN_LIBS = $(PREOPEN_MODS)
 else

commit c9375aa5e936cf896946f1f7bd80cce9cfe5d9a1
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Oct 12 21:20:45 2009 +0200

    libpulse: add missing includes

diff --git a/src/pulse/ext-stream-restore.h b/src/pulse/ext-stream-restore.h
index 0b5d8eb..54516f6 100644
--- a/src/pulse/ext-stream-restore.h
+++ b/src/pulse/ext-stream-restore.h
@@ -24,6 +24,8 @@
 
 #include <pulse/context.h>
 #include <pulse/version.h>
+#include <pulse/volume.h>
+#include <pulse/channelmap.h>
 
 /** \file
  *
diff --git a/src/pulse/stream.h b/src/pulse/stream.h
index 21dd0a8..2e8e71a 100644
--- a/src/pulse/stream.h
+++ b/src/pulse/stream.h
@@ -31,6 +31,8 @@
 #include <pulse/def.h>
 #include <pulse/cdecl.h>
 #include <pulse/operation.h>
+#include <pulse/context.h>
+#include <pulse/proplist.h>
 
 /** \page streams Audio Streams
  *

-- 
hooks/post-receive
PulseAudio Sound Server