[pulseaudio-commits] 2 commits - configure.ac src/Makefile.am src/modules

[David Henningsson]

 configure.ac                        |    1 +
 src/Makefile.am                     |    6 +++++-
 src/modules/bluetooth/bluez5-util.c |    6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 9793870b2372763b09e37e616c93781f3fe17865
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Fri Nov 28 13:43:07 2014 +0100

    bluez5: Fix free order of adapters and devices
    
    Because the adapters reference the devices hashmap on free, we mush
    free the adapters hashmap first and then the devices hashmap.
    
    Reported-by: Alexander Patrakov <patrakov at gmail.com>
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c
index 6894e83..0b234ae 100644
--- a/src/modules/bluetooth/bluez5-util.c
+++ b/src/modules/bluetooth/bluez5-util.c
@@ -1660,12 +1660,12 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) {
 
     pa_dbus_free_pending_list(&y->pending);
 
-    if (y->devices)
-        pa_hashmap_free(y->devices);
-
     if (y->adapters)
         pa_hashmap_free(y->adapters);
 
+    if (y->devices)
+        pa_hashmap_free(y->devices);
+
     if (y->transports) {
         pa_assert(pa_hashmap_isempty(y->transports));
         pa_hashmap_free(y->transports);

commit 580f468900830592fb247952e5325eedc2297ba4
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Tue Dec 2 09:22:47 2014 +0100

    build-sys: Don't build srbchannel-test on targets without srbchannel
    
    Reported-by: Felipe Sateler <fsateler at debian.org>
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/configure.ac b/configure.ac
index fe8423f..a888c99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -449,6 +449,7 @@ AC_CHECK_HEADERS_ONCE([execinfo.h])
 AC_CHECK_HEADERS_ONCE([langinfo.h])
 AC_CHECK_HEADERS_ONCE([regex.h pcreposix.h])
 
+AM_CONDITIONAL(HAVE_SYS_EVENTFD_H, test "x$ac_cv_header_sys_eventfd_h" = "xyes")
 
 #### Typdefs, structures, etc. ####
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 4e60a98..88a824e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -288,11 +288,15 @@ TESTS_daemon = \
 
 if !OS_IS_WIN32
 TESTS_default += \
-		srbchannel-test \
 		sigbus-test \
 		usergroup-test
 endif
 
+if HAVE_SYS_EVENTFD_H
+TESTS_default += \
+		srbchannel-test
+endif
+
 if !OS_IS_DARWIN
 TESTS_default += \
 		once-test