configure.ac | 2 +- po/POTFILES.in | 3 ++- src/Makefile.am | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-)
New commits: commit 5cc60fa89784199fad27416d1d3bde0a24e808b1 Author: Arun Raghavan <[email protected]> Date: Sat Nov 3 11:50:10 2012 +0100 build-sys: Document libpulsecommon vs. libpulse duplication diff --git a/src/Makefile.am b/src/Makefile.am index ed6f8e2..cbd7733 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -559,6 +559,11 @@ echo_cancel_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) pkglib_LTLIBRARIES = \ libpulsecommon-@[email protected] +# We duplicate files from pulse/ in this to allow as-needed linking. If we did +# not do this, in situations where code in libpulsecommon uses code in +# libpulse, we would then need to link libpulsecommon to libpulse (in addition +# to the existing libpulse being linked to libpulsecommon). Duplicating the +# code allows us to prevent this circular linking. libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \ pulse/client-conf.c pulse/client-conf.h \ pulse/fork-detect.c pulse/fork-detect.h \ commit d754b63bcbdab1144443755854fb1eb9e0b50405 Author: Arun Raghavan <[email protected]> Date: Sat Nov 3 10:52:35 2012 +0100 i18n: Fix POTFILES for poll changes poll.c was moved to poll-posix.c and poll-win32.c was added for the Windows port. diff --git a/po/POTFILES.in b/po/POTFILES.in index c90c410..ec87b18 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -114,7 +114,8 @@ src/pulsecore/hashmap.c src/pulsecore/avahi-wrap.c src/pulsecore/authkey.c src/pulsecore/namereg.c -src/pulsecore/poll.c +src/pulsecore/poll-posix.c +src/pulsecore/poll-win32.c src/pulsecore/tokenizer.c src/pulsecore/semaphore-posix.c src/pulsecore/cli-text.c commit 5ec0d8122a474e21ce3ded3b76b74bc63a0c3337 Author: Arun Raghavan <[email protected]> Date: Sat Nov 3 10:44:42 2012 +0100 build-sys: Bump soname diff --git a/configure.ac b/configure.ac index 6425d1e..5c70632 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,7 @@ AC_SUBST(PA_PROTOCOL_VERSION, 27) # The stable ABI for client applications, for the version info x:y:z # always will hold y=z -AC_SUBST(LIBPULSE_VERSION_INFO, [14:2:14]) +AC_SUBST(LIBPULSE_VERSION_INFO, [15:0:15]) # A simplified, synchronous, ABI-stable interface for client # applications, for the version info x:y:z always will hold y=z _______________________________________________ pulseaudio-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
