diff options
| author | Colin Guthrie <colin@mageia.org> | 2011-09-04 20:40:21 +0200 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-09-05 10:32:28 +0200 |
| commit | 1595608b0b1da794ad79e42c0131c9cb523e9b0b (patch) | |
| tree | c63fe94c2b3eae21bfc97ec07b22cd78485c7af8 | |
| parent | 2b96fdfd2501d7c4728d506a33ecc4575ac66f48 (diff) | |
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
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/map-file | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index bbdf5eb9..f02dded3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -532,7 +532,6 @@ libpulsecommon_@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_@PA_MAJORMINOR@_la_SOURCES = \ pulsecore/sndfile-util.c pulsecore/sndfile-util.h \ pulsecore/socket.h -libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) $(LIBJSON_CFLAGS) +libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(LIBJSON_LIBS) +libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) if HAVE_X11 libpulsecommon_@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-@PA_MAJORMINOR@.la +libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) +libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBJSON_LIBS) libpulsecommon-@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 903f0bdd..8e2c8015 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; |