[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.11-152-g2a78f86

[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  dc9b8dce309728b47059b9b44fd3bbd3798667ae (commit)

- Log -----------------------------------------------------------------
2a78f86... Fix more linking issues in x11-publish and stream-restore
4282b72... Merge branch 'master' of git://git.0pointer.de/pulseaudio
bf17dbb... Merge branch 'master' of git://git.0pointer.de/pulseaudio
ec78981... Fix linking
5744237... Merge branch 'master' of git://git.0pointer.de/pulseaudio
b30a5d6... Merge branch 'master' of git://git.0pointer.de/pulseaudio
0e1936f... Merge branch 'master' of git://git.0pointer.de/pulseaudio
0786de2... Fix documentation of constant: PA_VOLUME_MUTED (not PA_VOLUME_MUTE)
-----------------------------------------------------------------------

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

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

commit 0786de2ba5b75c557426cf05075823d8f4e3662b
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Thu Jul 3 23:06:08 2008 +0100

    Fix documentation of constant: PA_VOLUME_MUTED (not PA_VOLUME_MUTE)

diff --git a/src/pulse/volume.h b/src/pulse/volume.h
index 3befb1d..5cce083 100644
--- a/src/pulse/volume.h
+++ b/src/pulse/volume.h
@@ -61,7 +61,7 @@
  *
  * The functions described above are only valid when used with
  * software volumes. Hence it is usually a better idea to treat all
- * volume values as opaque with a range from PA_VOLUME_MUTE (0%) to
+ * volume values as opaque with a range from PA_VOLUME_MUTED (0%) to
  * PA_VOLUME_NORM (100%) and to refrain from any calculations with
  * them.
  *

commit 0e1936fd56ad51509424f3eca06fe3a442b4dc9c
Merge: 0786de2... 46a35c6...
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Mon Jul 21 16:04:06 2008 +0100

    Merge branch 'master' of git://git.0pointer.de/pulseaudio


commit b30a5d601eaffd98914ca0b9fdecd863eade0b4f
Merge: 0e1936f... 0b428e7...
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Wed Jul 30 23:43:45 2008 +0100

    Merge branch 'master' of git://git.0pointer.de/pulseaudio


commit 5744237a066186be305be9ea3ecb3ccccadcceca
Merge: b30a5d6... 04ffac5...
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Sun Aug 3 19:56:49 2008 +0100

    Merge branch 'master' of git://git.0pointer.de/pulseaudio


commit ec78981054f5164a5ef4a13e377ee3347d2605b4
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Sun Aug 3 23:38:13 2008 +0100

    Fix linking

diff --git a/src/Makefile.am b/src/Makefile.am
index 2770b93..6b8b115 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -966,7 +966,7 @@ libtagstruct_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(WINSOCK_LIBS)
 
 libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h
 libprotocol_esound_la_LDFLAGS = -avoid-version
-libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libpulsecore.la libipacl.la
+libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libauth-cookie.la libpulsecore.la libipacl.la
 
 libauthkey_la_SOURCES = pulsecore/authkey.c pulsecore/authkey.h
 libauthkey_la_LDFLAGS = -avoid-version
@@ -974,7 +974,7 @@ libauthkey_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 libauth_cookie_la_SOURCES = pulsecore/auth-cookie.c pulsecore/auth-cookie.h
 libauth_cookie_la_LDFLAGS = -avoid-version
-libauth_cookie_la_LIBADD = $(AM_LIBADD) libpulsecore.la
+libauth_cookie_la_LIBADD = $(AM_LIBADD) libauthkey.la libpulsecore.la
 
 libsocket_util_la_SOURCES = \
 		pulsecore/inet_ntop.c pulsecore/inet_ntop.h \

commit bf17dbb101d509e885bf689f4f13f75e4b3ab58d
Merge: ec78981... 5f69b5d...
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Sun Aug 3 23:38:44 2008 +0100

    Merge branch 'master' of git://git.0pointer.de/pulseaudio


commit 4282b726ee57ebae846ce400fd1cae43c4dfb2ae
Merge: bf17dbb... dc9b8dc...
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Fri Aug 22 10:56:45 2008 +0100

    Merge branch 'master' of git://git.0pointer.de/pulseaudio


commit 2a78f865c15802cd21f36389aaf663fe3a680501
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Fri Aug 22 10:58:21 2008 +0100

    Fix more linking issues in x11-publish and stream-restore

diff --git a/src/Makefile.am b/src/Makefile.am
index 21584ad..94837a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1371,7 +1371,7 @@ module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA
 module_x11_publish_la_SOURCES = modules/module-x11-publish.c
 module_x11_publish_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
 module_x11_publish_la_LDFLAGS = -module -avoid-version
-module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libauthkey.la libauth-cookie.la libx11prop.la libstrlist.la libpulsecore.la
+module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libauthkey.la libauth-cookie.la libx11prop.la libstrlist.la libprotocol-native.la libpulsecore.la
 
 module_x11_xsmp_la_SOURCES = modules/module-x11-xsmp.c
 module_x11_xsmp_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
@@ -1471,7 +1471,7 @@ module_device_restore_la_CFLAGS = $(AM_CFLAGS)
 # Stream volume/muted/device restore module
 module_stream_restore_la_SOURCES = modules/module-stream-restore.c
 module_stream_restore_la_LDFLAGS = -module -avoid-version
-module_stream_restore_la_LIBADD = $(AM_LIBADD) libpulsecore.la -lgdbm
+module_stream_restore_la_LIBADD = $(AM_LIBADD) libtagstruct.la libprotocol-native.la libpulsecore.la -lgdbm
 module_stream_restore_la_CFLAGS = $(AM_CFLAGS)
 
 # Default sink/source restore module

-- 
hooks/post-receive
PulseAudio Sound Server