[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-114-ga2b3d25

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

- Log -----------------------------------------------------------------
a2b3d25... update map file
1cd25f1... reorder setting of AM_CFLAGS a bit
c4b3462... make the debug trap macro a proper macro in macro.h
-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am       |   41 +++++++++++++++++++++--------------------
 src/map-file          |    4 +++-
 src/pulsecore/macro.h |    6 ++++++
 3 files changed, 30 insertions(+), 21 deletions(-)

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

commit c4b346259fa59dfad040c51ab064ed44395d0911
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Oct 21 22:04:22 2008 +0200

    make the debug trap macro a proper macro in macro.h

diff --git a/src/pulsecore/macro.h b/src/pulsecore/macro.h
index cf02696..f9ce949 100644
--- a/src/pulsecore/macro.h
+++ b/src/pulsecore/macro.h
@@ -220,6 +220,12 @@ typedef int pa_bool_t;
 
 #endif
 
+#if defined(__i386__) || defined(__x86_64__)
+#define PA_DEBUG_TRAP __asm__("int $3")
+#else
+#define PA_DEBUG_TRAP raise(SIGTRAP)
+#endif
+
 /* We include this at the very last place */
 #include <pulsecore/log.h>
 

commit 1cd25f1485474282b989c271d51a4e957fc2ec22
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Oct 21 22:05:13 2008 +0200

    reorder setting of AM_CFLAGS a bit

diff --git a/src/Makefile.am b/src/Makefile.am
index 4d1812e..b911c43 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,26 +45,27 @@ endif
 #     Compiler/linker flags       #
 ###################################
 
-AM_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/modules -I$(top_builddir)/src/modules/rtp -I$(top_builddir)/src/modules/gconf -I$(top_builddir)/src/modules/bluetooth
-AM_CFLAGS += $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS
-AM_CFLAGS += $(LTDLINCL)
-AM_CFLAGS += $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) $(LIBSPEEX_CFLAGS)
-AM_CFLAGS += -DPA_DLSEARCHPATH=\"$(modlibexecdir)\"
-AM_CFLAGS += -DPA_DEFAULT_CONFIG_DIR=\"$(PA_DEFAULT_CONFIG_DIR)\"
-AM_CFLAGS += -DPA_BINARY=\"$(PA_BINARY)\"
-AM_CFLAGS += -DPA_SYSTEM_RUNTIME_PATH=\"$(PA_SYSTEM_RUNTIME_PATH)\"
-AM_CFLAGS += -DPA_SYSTEM_CONFIG_PATH=\"$(PA_SYSTEM_CONFIG_PATH)\"
-AM_CFLAGS += -DPA_SYSTEM_STATE_PATH=\"$(PA_SYSTEM_STATE_PATH)\"
-AM_CFLAGS += -DAO_REQUIRE_CAS
-AM_CFLAGS += -DPULSE_LOCALEDIR=\"$(pulselocaledir)\"
-AM_CFLAGS += -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\"
-
-# This cool debug trap works on i386/gcc only
-AM_CFLAGS += '-DDEBUG_TRAP=__asm__("int $$3")'
-
-if HAVE_OPENSSL
-AM_CFLAGS += -I$(top_builddir)/src/modules/raop
-endif
+AM_CFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src/modules \
+	-I$(top_builddir)/src/modules/rtp \
+	-I$(top_builddir)/src/modules/gconf \
+	-I$(top_builddir)/src/modules/bluetooth \
+	-I$(top_builddir)/src/modules/raop \
+	$(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
+	$(LTDLINCL) \
+	$(LIBSAMPLERATE_CFLAGS) \
+	$(LIBSNDFILE_CFLAGS) \
+	$(LIBSPEEX_CFLAGS) \
+	-DPA_DLSEARCHPATH=\"$(modlibexecdir)\" \
+	-DPA_DEFAULT_CONFIG_DIR=\"$(PA_DEFAULT_CONFIG_DIR)\" \
+	-DPA_BINARY=\"$(PA_BINARY)\" \
+	-DPA_SYSTEM_RUNTIME_PATH=\"$(PA_SYSTEM_RUNTIME_PATH)\" \
+	-DPA_SYSTEM_CONFIG_PATH=\"$(PA_SYSTEM_CONFIG_PATH)\" \
+	-DPA_SYSTEM_STATE_PATH=\"$(PA_SYSTEM_STATE_PATH)\" \
+	-DAO_REQUIRE_CAS \
+	-DPULSE_LOCALEDIR=\"$(pulselocaledir)\" \
+	-DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\"
 
 AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS)
 AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS)

commit a2b3d252af673b7261198bb753375d40f9b5c0ee
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Oct 22 02:22:19 2008 +0200

    update map file

diff --git a/src/map-file b/src/map-file
index 7211914..ca523b9 100644
--- a/src/map-file
+++ b/src/map-file
@@ -105,7 +105,6 @@ pa_cvolume_max;
 pa_cvolume_remap;
 pa_cvolume_set;
 pa_cvolume_snprint;
-pa_sw_cvolume_snprint_dB;
 pa_cvolume_valid;
 pa_ext_stream_restore_delete;
 pa_ext_stream_restore_read;
@@ -228,7 +227,10 @@ pa_stream_update_timing_info;
 pa_stream_writable_size;
 pa_stream_write;
 pa_strerror;
+pa_sw_cvolume_divide;
 pa_sw_cvolume_multiply;
+pa_sw_cvolume_snprint_dB;
+pa_sw_volume_divide;
 pa_sw_volume_from_dB;
 pa_sw_volume_from_linear;
 pa_sw_volume_multiply;

-- 
hooks/post-receive
PulseAudio Sound Server