[pulseaudio-commits] 4 commits - configure.ac .gitignore meson.build src/modules src/pulsecore

[Arun Raghavan]

 .gitignore                              |    2 +-
 configure.ac                            |    9 ---------
 meson.build                             |    6 +++++-
 src/modules/dbus/module-dbus-protocol.c |    8 --------
 src/pulsecore/dbus-util.c               |    8 --------
 5 files changed, 6 insertions(+), 27 deletions(-)

New commits:
commit 30f49dae18069f8ada76d9103902b167c3f7f275
Author: Arun Raghavan <arun at arunraghavan.net>
Date:   Mon Jul 23 19:40:51 2018 +0530

    gitignore: Ignore build* directories
    
    We already had build-aux, might as well generalise for build directories
    we create for autotools out-of-tree builds and anything meson-based.

diff --git a/.gitignore b/.gitignore
index ef145bbb..21a667e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 .version
 .*.swp
 ABOUT-NLS
-build-aux
+build*
 *~
 *.tar.gz
 *.pc

commit 55fa5acd685a4ea984b6dfc4129079779a09cb80
Author: Arun Raghavan <arun at arunraghavan.net>
Date:   Mon Jul 23 19:40:46 2018 +0530

    build-sys: Update meson version dependency
    
    We're using SIMD detection logic from 0.42.

diff --git a/meson.build b/meson.build
index 08a5fa9a..ee40b465 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('pulseaudio', 'c', 'cpp',
         version : '10.99.1',
-        meson_version : '>= 0.31.0',
+        meson_version : '>= 0.42.0',
         default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ]
         )
 

commit dc966c6e46de2add009e73abada14a8b7782c561
Author: Arun Raghavan <arun at arunraghavan.net>
Date:   Sun May 20 08:29:02 2018 +0530

    build-sys: Add some missing header/function checks to meson build

diff --git a/meson.build b/meson.build
index 9308aa9f..08a5fa9a 100644
--- a/meson.build
+++ b/meson.build
@@ -57,6 +57,7 @@ cdata.set_quoted('DESKTOPFILEDIR', join_paths(datadir, 'applications'))
 check_headers = [
   'arpa/inet.h',
   'cpuid.h',
+  'execinfo.h',
   'grp.h',
   'langinfo.h',
   'locale.h',
@@ -78,6 +79,7 @@ check_headers = [
   'sys/select.h',
   'sys/socket.h',
   'sys/un.h',
+  'sys/wait.h',
   'valgrind/memcheck.h',
   'xlocale.h',
 ]
@@ -104,6 +106,8 @@ check_functions = [
   'fork',
   'fstat',
   'getaddrinfo',
+  'getgrgid_r',
+  'getpwnam_r',
   'gettimeofday',
   'getuid',
   'lstat',

commit f38485dc1af27e877ff4fdea34d2d05b48c6aacb
Author: Arun Raghavan <arun at arunraghavan.net>
Date:   Sun May 20 08:27:42 2018 +0530

    build-sys: Drop ancient check for dbus_watch_get_unix_fd()
    
    This function was added shortly after dbus 1.1.0, and our minimum
    required dbus version is greater than 1.4.

diff --git a/configure.ac b/configure.ac
index 8890aa15..d2bfab23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1041,15 +1041,6 @@ AS_IF([test "x$enable_dbus" != "xno"],
 AS_IF([test "x$enable_dbus" = "xyes" && test "x$HAVE_DBUS" = "x0"],
     [AC_MSG_ERROR([*** D-Bus not available or too old version])])
 
-AS_IF([test "x$HAVE_DBUS" = "x1"],
-    [
-        save_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS $DBUS_CFLAGS"
-        save_LIBS="$LIBS"; LIBS="$LIBS $DBUS_LIBS"
-        AC_CHECK_FUNCS(dbus_watch_get_unix_fd)
-        CFLAGS="$save_CFLAGS"
-        LIBS="$save_LIBS"
-    ])
-
 AC_SUBST(HAVE_DBUS)
 AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1])
 AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]))
diff --git a/src/modules/dbus/module-dbus-protocol.c b/src/modules/dbus/module-dbus-protocol.c
index 259eb9f0..8a83c769 100644
--- a/src/modules/dbus/module-dbus-protocol.c
+++ b/src/modules/dbus/module-dbus-protocol.c
@@ -218,11 +218,7 @@ static void io_event_cb(pa_mainloop_api *mainloop, pa_io_event *e, int fd, pa_io
     unsigned int flags = 0;
     DBusWatch *watch = userdata;
 
-#ifdef HAVE_DBUS_WATCH_GET_UNIX_FD
     pa_assert(fd == dbus_watch_get_unix_fd(watch));
-#else
-    pa_assert(fd == dbus_watch_get_fd(watch));
-#endif
 
     if (!dbus_watch_get_enabled(watch)) {
         pa_log_warn("Asked to handle disabled watch: %p %i", (void*) watch, fd);
@@ -289,11 +285,7 @@ static dbus_bool_t watch_add_cb(DBusWatch *watch, void *data) {
 
     ev = mainloop->io_new(
             mainloop,
-#ifdef HAVE_DBUS_WATCH_GET_UNIX_FD
             dbus_watch_get_unix_fd(watch),
-#else
-            dbus_watch_get_fd(watch),
-#endif
             get_watch_flags(watch), io_event_cb, watch);
 
     dbus_watch_set_data(watch, ev, NULL);
diff --git a/src/pulsecore/dbus-util.c b/src/pulsecore/dbus-util.c
index d5d5f7e1..7d550204 100644
--- a/src/pulsecore/dbus-util.c
+++ b/src/pulsecore/dbus-util.c
@@ -100,11 +100,7 @@ static void handle_io_event(pa_mainloop_api *ea, pa_io_event *e, int fd, pa_io_e
     unsigned int flags = 0;
     DBusWatch *watch = userdata;
 
-#ifdef HAVE_DBUS_WATCH_GET_UNIX_FD
     pa_assert(fd == dbus_watch_get_unix_fd(watch));
-#else
-    pa_assert(fd == dbus_watch_get_fd(watch));
-#endif
 
     if (!dbus_watch_get_enabled(watch)) {
         pa_log_warn("Asked to handle disabled watch: %p %i", (void*) watch, fd);
@@ -153,11 +149,7 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data) {
 
     ev = c->mainloop->io_new(
             c->mainloop,
-#ifdef HAVE_DBUS_WATCH_GET_UNIX_FD
             dbus_watch_get_unix_fd(watch),
-#else
-            dbus_watch_get_fd(watch),
-#endif
             get_watch_flags(watch), handle_io_event, watch);
 
     dbus_watch_set_data(watch, ev, NULL);