[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-117-gff5b7fb

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  862a05f8c8b9d02520c904e4eff0740f1c56f181 (commit)

- Log -----------------------------------------------------------------
ff5b7fb Add missing headers' include to build on FreeBSD 7.1.
99f2541 Add missing include directory path for OSS modules.
d45c909 When MAP_ANONYMOUS is missing, fallback to MAP_ANON.
0de6877 Don't use == for comparison in tests. Fix build with non-bash shells.
-----------------------------------------------------------------------

Summary of changes:
 configure.ac                  |   10 +++++-----
 src/Makefile.am               |    2 ++
 src/modules/rtp/rtsp_client.c |    1 +
 src/pulsecore/memtrap.c       |    5 +++++
 src/pulsecore/parseaddr.c     |    1 +
 5 files changed, 14 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------

commit 0de6877934cd70874b7baa7e9ab416c43b7f9fc5
Author: Diego Elio 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date:   Fri May 15 22:43:56 2009 +0200

    Don't use == for comparison in tests. Fix build with non-bash shells.

diff --git a/configure.ac b/configure.ac
index 16e6648..37b9fc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -608,30 +608,30 @@ AC_ARG_WITH(
         [database],
         AS_HELP_STRING([--with-database=auto|tdb|gdbm],[Choose database backend.]),[],[with_database=auto])
 
-if test "x${with_database}" == "xauto" -o "x${with_database}" == "xtdb" ; then
+if test "x${with_database}" = "xauto" -o "x${with_database}" = "xtdb" ; then
     PKG_CHECK_MODULES(TDB, [ tdb ],
         [
             HAVE_TDB=1
             with_database=tdb
         ], [
-            if test "x${with_database}" == "xtdb" ; then
+            if test "x${with_database}" = "xtdb" ; then
                 AC_MSG_ERROR([*** tdb not found])
             fi
         ])
 fi
 
-if test "x${with_database}" == "xauto" -o "x${with_database}" == "xgdbm" ; then
+if test "x${with_database}" = "xauto" -o "x${with_database}" = "xgdbm" ; then
    have_gdbm=yes
 
    AC_CHECK_LIB(gdbm, gdbm_open, [], [have_gdbm=no])
    AC_CHECK_HEADERS(gdbm.h, [], [have_gdbm=no])
 
-   if test "x${have_gdbm}" == "xyes" ; then
+   if test "x${have_gdbm}" = "xyes" ; then
        HAVE_GDBM=1
        GDBM_CFLAGS=
        GDBM_LIBS=-lgdbm
        with_database=gdbm
-   elif test "x${with_database}" == "xgdbm"; then
+   elif test "x${with_database}" = "xgdbm"; then
        AC_MSG_ERROR([*** gdbm not found])
    fi
 fi

commit d45c909ab37630c772c1852082cee90086e70b03
Author: Diego Elio 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date:   Fri May 15 23:09:59 2009 +0200

    When MAP_ANONYMOUS is missing, fallback to MAP_ANON.
    
    While the latter is deprecated on modern systems like glibc-based ones,
    FreeBSD (and probably others) still use it, so make sure it falls back if
    the new one is missing.

diff --git a/src/pulsecore/memtrap.c b/src/pulsecore/memtrap.c
index 601fef4..e06f60c 100644
--- a/src/pulsecore/memtrap.c
+++ b/src/pulsecore/memtrap.c
@@ -26,6 +26,11 @@
 #include <signal.h>
 #include <sys/mman.h>
 
+/* This is deprecated on glibc but is still used by FreeBSD */
+#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
+# define MAP_ANONYMOUS MAP_ANON
+#endif
+
 #include <pulse/xmalloc.h>
 
 #include <pulsecore/core-util.h>

commit 99f254103818390ae4577ef77f288759d3c8f152
Author: Diego Elio 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date:   Fri May 15 23:42:29 2009 +0200

    Add missing include directory path for OSS modules.

diff --git a/src/Makefile.am b/src/Makefile.am
index 49a0c69..b6c98fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,6 +56,8 @@ AM_CFLAGS = \
 	-I$(top_builddir)/src/modules/gconf \
 	-I$(top_srcdir)/src/modules/bluetooth \
 	-I$(top_builddir)/src/modules/bluetooth \
+	-I$(top_srcdir)/src/modules/oss \
+	-I$(top_builddir)/src/modules/oss \
 	-I$(top_srcdir)/src/modules/alsa \
 	-I$(top_builddir)/src/modules/alsa \
 	-I$(top_srcdir)/src/modules/raop \

commit ff5b7fb222db265dfbc5f44dc3d55ce6396d78ca
Author: Diego Elio 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date:   Fri May 15 23:42:43 2009 +0200

    Add missing headers' include to build on FreeBSD 7.1.

diff --git a/src/modules/rtp/rtsp_client.c b/src/modules/rtp/rtsp_client.c
index 629328a..cb037de 100644
--- a/src/modules/rtp/rtsp_client.c
+++ b/src/modules/rtp/rtsp_client.c
@@ -30,6 +30,7 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include <netinet/in.h>
 
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>
diff --git a/src/pulsecore/parseaddr.c b/src/pulsecore/parseaddr.c
index 1cd010b..44cd9a0 100644
--- a/src/pulsecore/parseaddr.c
+++ b/src/pulsecore/parseaddr.c
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <arpa/inet.h>
+#include <sys/socket.h>
 
 #include <pulse/xmalloc.h>
 #include <pulse/util.h>

-- 
hooks/post-receive
PulseAudio Sound Server