[pulseaudio-commits] Branch 'stable-2.x' - 3 commits -

[Arun Raghavan]

 0 files changed

New commits:
commit 4636f560908fa50256c84dfb0977eb380adb8d69
Merge: 8c34ed7... 4071364...
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Tue Sep 25 02:30:46 2012 +0800

    Merge commit 'v2.1' into stable-2.x
    
    v2.1 is identical to 8c34ed7e3bc626fee51b5c07dcd38f8da6f42dd6 which was
    HEAD at the time of the 2.1 release, but with the top 2 commits in
    reverse order.


commit 40713647e7e66d8f1d893618037e00c09bdeb99d
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Thu Jul 19 16:55:03 2012 +0530

    build: Fix distcheck failure on libwebrtc-util
    
    Without -avoid-version, libtool creates a libwebrtc-util.so.0 and
    libwebrtc-util.so.0.0.0 which are not cleaned up by make uninstall,
    which in turn causes make distcheck to fail.

diff --git a/src/Makefile.am b/src/Makefile.am
index 187e030..9b71b17 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1842,6 +1842,7 @@ modlibexec_LTLIBRARIES += libwebrtc-util.la
 libwebrtc_util_la_SOURCES = modules/echo-cancel/webrtc.cc
 libwebrtc_util_la_CXXFLAGS = $(AM_CXXFLAGS) $(SERVER_CFLAGS) $(WEBRTC_CFLAGS) -DHAVE_WEBRTC=1
 libwebrtc_util_la_LIBADD = $(WEBRTC_LIBS)
+libwebrtc_util_la_LDFLAGS = -avoid-version
 
 module_echo_cancel_la_CFLAGS += -DHAVE_WEBRTC=1
 module_echo_cancel_la_LIBADD += libwebrtc-util.la

commit c4655d10c6c11eec6dc472c0d04085f285d01bdd
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Wed Jul 18 12:23:17 2012 +0530

    build: Bump soname

diff --git a/configure.ac b/configure.ac
index 1936d7c..a78098c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_SUBST(PA_PROTOCOL_VERSION, 26)
 
 # 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, [14:3:14])
 
 # A simplified, synchronous, ABI-stable interface for client
 # applications, for the version info x:y:z always will hold y=z