[pulseaudio-commits] 3 commits - configure.ac src/Makefile.am src/modules src/pulsecore src/tests

[Arun Raghavan]

 configure.ac                     |   10 ++--------
 src/Makefile.am                  |    4 +++-
 src/modules/alsa/alsa-mixer.c    |    2 +-
 src/pulsecore/core-util.c        |    4 ----
 src/pulsecore/core-util.h        |    9 +--------
 src/tests/alsa-mixer-path-test.c |    2 +-
 6 files changed, 8 insertions(+), 23 deletions(-)

New commits:
commit 1ffbb323c676ea95818b31fa0616b11e48219f1c
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Mon Apr 15 23:33:13 2013 +0530

    build-sys: Bump sonames
    
    libpulse-simple changed this time as well (addition of hole-handling).

diff --git a/configure.ac b/configure.ac
index 6a45c12..c8161a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,15 +44,11 @@ AC_SUBST(PA_PROTOCOL_VERSION, 28)
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold y=z
-AC_SUBST(LIBPULSE_VERSION_INFO, [15:3:15])
+AC_SUBST(LIBPULSE_VERSION_INFO, [16:0:16])
 
 # A simplified, synchronous, ABI-stable interface for client
 # applications, for the version info x:y:z always will hold y=z
-AC_SUBST(LIBPULSE_SIMPLE_VERSION_INFO, [0:3:0])
-
-# The ABI-stable network browsing interface for client applications,
-# for the version info x:y:z always will hold y=z
-AC_SUBST(LIBPULSE_BROWSE_VERSION_INFO, [1:1:1])
+AC_SUBST(LIBPULSE_SIMPLE_VERSION_INFO, [0:4:0])
 
 # The ABI-stable GLib adapter for client applications, for the version
 # info x:y:z always will hold y=z

commit 11d8da83d487ecccf0a790b032acdeffef77055a
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Sun Apr 14 11:24:41 2013 +0530

    alsa: Fix mixer path when running from build tree
    
    The mixer paths are not available in ${builddir} - we need to look in
    ${srcdir}. This should fix running an in-tree build without make install
    as well as alsa-mixer-path-test in make distcheck.
    
    Since the most straightforward way to define PA_SRCDIR was in
    Makefile.am, I'm moving PA_BUILDDIR there as well for consistency.

diff --git a/configure.ac b/configure.ac
index 43d3b44..6a45c12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1239,8 +1239,6 @@ AC_SUBST(PA_SOEXT, [.so])
 AC_SUBST(pulseconfdir, ["${sysconfdir}/pulse"])
 AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files])
 
-AC_DEFINE_UNQUOTED(PA_BUILDDIR, "${ac_pwd}/src", [Location of uninstalled binaries])
-
 #### Mac OSX specific stuff #####
 
 AC_ARG_ENABLE(mac-universal,
diff --git a/src/Makefile.am b/src/Makefile.am
index 4b3efa3..a621a30 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,7 +48,9 @@ AM_CPPFLAGS = \
 	-DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
 	-DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
 AM_CFLAGS = \
-	$(PTHREAD_CFLAGS)
+	$(PTHREAD_CFLAGS) \
+	-DPA_SRCDIR=\"$(abs_srcdir)\" \
+	-DPA_BUILDDIR=\"$(abs_builddir)\"
 AM_CXXFLAGS = $(AM_CFLAGS)
 SERVER_CFLAGS = -D__INCLUDED_FROM_PULSE_AUDIO
 
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index b65baeb..554a57d 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -2373,7 +2373,7 @@ static int path_verify(pa_alsa_path *p) {
 
 static const char *get_default_paths_dir(void) {
     if (pa_run_from_build_tree())
-        return PA_BUILDDIR "/modules/alsa/mixer/paths/";
+        return PA_SRCDIR "/modules/alsa/mixer/paths/";
     else
         return PA_ALSA_PATHS_DIR;
 }
diff --git a/src/tests/alsa-mixer-path-test.c b/src/tests/alsa-mixer-path-test.c
index 1ad06ee..f2bc4cb 100644
--- a/src/tests/alsa-mixer-path-test.c
+++ b/src/tests/alsa-mixer-path-test.c
@@ -16,7 +16,7 @@
 /* This function was copied from alsa-mixer.c */
 static const char *get_default_paths_dir(void) {
     if (pa_run_from_build_tree())
-        return PA_BUILDDIR "/modules/alsa/mixer/paths/";
+        return PA_SRCDIR "/modules/alsa/mixer/paths/";
     else
         return PA_ALSA_PATHS_DIR;
 }

commit ae559c0724d4f15748bb1e05547c6457adb61ad1
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Sun Apr 14 10:32:26 2013 +0530

    pulsecore: Don't conditionally inline pa_run_from_build_tree()
    
    There's no good reason to assume an in-tree build will be debug-only.
    This breaks alsa-mixer-path-test on make distcheck, for example.

diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 1f4fca1..657e500 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -3207,8 +3207,6 @@ void pa_reset_personality(void) {
 
 }
 
-#if defined(__linux__) && !defined(__OPTIMIZE__)
-
 pa_bool_t pa_run_from_build_tree(void) {
     char *rp;
     pa_bool_t b = FALSE;
@@ -3221,8 +3219,6 @@ pa_bool_t pa_run_from_build_tree(void) {
     return b;
 }
 
-#endif
-
 const char *pa_get_temp_dir(void) {
     const char *t;
 
diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h
index 9d59383..15e6809 100644
--- a/src/pulsecore/core-util.h
+++ b/src/pulsecore/core-util.h
@@ -260,14 +260,7 @@ size_t pa_pipe_buf(int fd);
 
 void pa_reset_personality(void);
 
-/* We abuse __OPTIMIZE__ as a check whether we are a debug build
- * or not. If we are and are run from the build tree then we
- * override the search path to point to our build tree */
-#if defined(__linux__) && !defined(__OPTIMIZE__)
-pa_bool_t pa_run_from_build_tree(void);
-#else
-static inline pa_bool_t pa_run_from_build_tree(void) {return FALSE;}
-#endif
+pa_bool_t pa_run_from_build_tree(void) PA_GCC_CONST;
 
 const char *pa_get_temp_dir(void);