[pulseaudio-commits] 2 commits - src/Makefile.am src/map-file

[Colin Guthrie]

 src/Makefile.am |   10 +++++-----
 src/map-file    |    5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 03b97d0e08ed6a8578a94970390c7347d0deb9de
Author: Colin Guthrie <colin at mageia.org>
Date:   Sun Sep 4 21:05:14 2011 +0200

    formats: Export more functions needed for a clean build.
    
    All of these functions are not actually defined in format.h
    (they are defined in internal.h) and thus should really be
    included only in libpulsecommon and implemented in a separate
    source file.
    
    However if that approach was taken, and these functions were
    included in libpulsecommon, then they would have a link time
    dependancy on libpulse (as these four functions use other
    pa_format_info_* functions). As the opposite is already true
    (libpulse depends on libpulsecommon), this is not possible as
    it creates a circular dependancy.
    
    Thus the only option is to just to include these four functions
    in the map-file, but not actually export any public headers for
    them. Of course users could use this implementation by defining
    them in their own headers, but the only practical problem
    with this approach is naming conflicts which is unlikely to happen.
    
    fdo#40616

diff --git a/src/map-file b/src/map-file
index 8e2c801..c98ac72 100644
--- a/src/map-file
+++ b/src/map-file
@@ -165,7 +165,9 @@ pa_ext_stream_restore_test;
 pa_ext_stream_restore_write;
 pa_format_info_copy;
 pa_format_info_free;
+pa_format_info_free2;
 pa_format_info_from_string;
+pa_format_info_from_sample_spec;
 pa_format_info_is_compatible;
 pa_format_info_is_pcm;
 pa_format_info_new;
@@ -179,6 +181,8 @@ pa_format_info_set_prop_string_array;
 pa_format_info_set_rate;
 pa_format_info_set_sample_format;
 pa_format_info_snprint;
+pa_format_info_to_sample_spec;
+pa_format_info_to_sample_spec_fake;
 pa_format_info_valid;
 pa_frame_size;
 pa_get_binary_name;

commit 1595608b0b1da794ad79e42c0131c9cb523e9b0b
Author: Colin Guthrie <colin at mageia.org>
Date:   Sun Sep 4 20:40:21 2011 +0200

    formats: The format code should be in libpulse, not libpulsecommon
    
    Without this change any applications calling e.g. pa_format_info_new()
    and friends will be explicitly linked against libpulsecommon-$MAJORMINOR.so
    which is something we specifically avoid as it may contain ABI/API unstable
    functions.
    
    Also ensure we export pa_format_info_from_string() for external use.
    
    fdo#40616

diff --git a/src/Makefile.am b/src/Makefile.am
index bbdf5eb..f02dded 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -532,7 +532,6 @@ libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = \
 		pulse/util.c pulse/util.h \
 		pulse/timeval.c pulse/timeval.h \
 		pulse/rtclock.c pulse/rtclock.h \
-		pulse/format.c pulse/format.h \
 		pulsecore/atomic.h \
 		pulsecore/authkey.c pulsecore/authkey.h \
 		pulsecore/conf-parser.c pulsecore/conf-parser.h \
@@ -590,9 +589,9 @@ libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = \
 		pulsecore/sndfile-util.c pulsecore/sndfile-util.h \
 		pulsecore/socket.h
 
-libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) $(LIBJSON_CFLAGS)
+libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
 libpulsecommon_ at PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
-libpulsecommon_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(LIBJSON_LIBS)
+libpulsecommon_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS)
 
 if HAVE_X11
 libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES += \
@@ -706,6 +705,7 @@ libpulse_la_SOURCES = \
 		pulse/ext-device-manager.c pulse/ext-device-manager.h \
 		pulse/ext-device-restore.c pulse/ext-device-restore.h \
 		pulse/ext-stream-restore.c pulse/ext-stream-restore.h \
+		pulse/format.c pulse/format.h \
 		pulse/gccmacro.h \
 		pulse/internal.h \
 		pulse/introspect.c pulse/introspect.h \
@@ -727,8 +727,8 @@ libpulse_la_SOURCES = \
 		pulse/volume.c pulse/volume.h \
 		pulse/xmalloc.c pulse/xmalloc.h
 
-libpulse_la_CFLAGS = $(AM_CFLAGS)
-libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon- at PA_MAJORMINOR@.la
+libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS)
+libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBJSON_LIBS) libpulsecommon- at PA_MAJORMINOR@.la
 libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO)
 
 if HAVE_DBUS
diff --git a/src/map-file b/src/map-file
index 903f0bd..8e2c801 100644
--- a/src/map-file
+++ b/src/map-file
@@ -165,6 +165,7 @@ pa_ext_stream_restore_test;
 pa_ext_stream_restore_write;
 pa_format_info_copy;
 pa_format_info_free;
+pa_format_info_from_string;
 pa_format_info_is_compatible;
 pa_format_info_is_pcm;
 pa_format_info_new;