Browse Source

Imported Upstream version 2.99.1

tags/upstream/2.99.1^0
Sjoerd Simons 9 years ago
parent
commit
c90c82795b
100 changed files with 7726 additions and 8330 deletions
  1. +1
    -1
      .tarball-version
  2. +1
    -1
      .version
  3. +0
    -2
      ChangeLog
  4. +10
    -5
      Makefile.in
  5. +43
    -3
      aclocal.m4
  6. +3
    -6
      config.h.in
  7. +309
    -136
      configure
  8. +84
    -45
      configure.ac
  9. +9
    -4
      doxygen/Makefile.in
  10. +12
    -2
      git-version-gen
  11. +1
    -1
      libpulse-mainloop-glib.pc.in
  12. +1
    -1
      libpulse-simple.pc.in
  13. +1
    -1
      libpulse.pc.in
  14. +9
    -4
      man/Makefile.in
  15. +2
    -2
      man/default.pa.5
  16. +2
    -2
      man/default.pa.5.xml.in
  17. +1
    -1
      man/pacat.1
  18. +1
    -1
      man/pacat.1.xml.in
  19. +5
    -2
      man/pactl.1
  20. +8
    -2
      man/pactl.1.xml.in
  21. +3
    -3
      man/pax11publish.1
  22. +4
    -4
      man/pax11publish.1.xml.in
  23. +7
    -1
      man/pulse-cli-syntax.5
  24. +11
    -1
      man/pulse-cli-syntax.5.xml.in
  25. +3
    -3
      man/pulse-client.conf.5
  26. +3
    -3
      man/pulse-client.conf.5.xml.in
  27. +6
    -6
      man/pulse-daemon.conf.5
  28. +6
    -6
      man/pulse-daemon.conf.5.xml.in
  29. +3
    -3
      man/pulseaudio.1
  30. +3
    -3
      man/pulseaudio.1.xml.in
  31. +2
    -2
      mkinstalldirs
  32. +1
    -0
      po/LINGUAS
  33. +3
    -2
      po/POTFILES.in
  34. +2
    -2
      po/as.po
  35. +2
    -2
      po/bn_IN.po
  36. +1
    -1
      po/fi.po
  37. +2
    -2
      po/gu.po
  38. +2
    -2
      po/hi.po
  39. +2307
    -0
      po/id.po
  40. +2
    -2
      po/ml.po
  41. +2
    -2
      po/pa.po
  42. +2
    -2
      po/ta.po
  43. +2
    -2
      po/zh_CN.po
  44. +163
    -130
      src/Makefile.am
  45. +665
    -635
      src/Makefile.in
  46. +2
    -2
      src/daemon/cmdline.c
  47. +144
    -123
      src/daemon/daemon-conf.c
  48. +1
    -5
      src/daemon/default.pa.in
  49. +1
    -5
      src/daemon/dumpmodules.c
  50. +3
    -3
      src/daemon/main.c
  51. +0
    -4
      src/daemon/pulseaudio-system.conf
  52. +1
    -0
      src/daemon/pulseaudio.desktop.in
  53. +2
    -0
      src/map-file
  54. +29
    -0
      src/module-bluetooth-policy-symdef.h
  55. +364
    -380
      src/modules/alsa/alsa-mixer.c
  56. +12
    -3
      src/modules/alsa/alsa-mixer.h
  57. +62
    -20
      src/modules/alsa/alsa-sink.c
  58. +62
    -20
      src/modules/alsa/alsa-source.c
  59. +1612
    -0
      src/modules/alsa/alsa-ucm.c
  60. +184
    -0
      src/modules/alsa/alsa-ucm.h
  61. +1
    -9
      src/modules/alsa/alsa-util.c
  62. +47
    -33
      src/modules/alsa/mixer/paths/analog-input-headphone-mic.conf
  63. +13
    -0
      src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
  64. +0
    -1
      src/modules/alsa/mixer/paths/analog-input-linein.conf
  65. +1
    -1
      src/modules/alsa/mixer/paths/analog-input.conf
  66. +5
    -0
      src/modules/alsa/mixer/paths/analog-output-headphones.conf
  67. +1
    -1
      src/modules/alsa/mixer/paths/analog-output-mono.conf
  68. +5
    -0
      src/modules/alsa/mixer/paths/analog-output-speaker.conf
  69. +15
    -6
      src/modules/alsa/mixer/paths/analog-output.conf.common
  70. +8
    -8
      src/modules/alsa/mixer/profile-sets/default.conf
  71. +8
    -8
      src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
  72. +7
    -7
      src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
  73. +7
    -7
      src/modules/alsa/mixer/profile-sets/force-speaker.conf
  74. +1
    -1
      src/modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
  75. +183
    -26
      src/modules/alsa/module-alsa-card.c
  76. +216
    -221
      src/modules/bluetooth/bluetooth-util.c
  77. +24
    -6
      src/modules/bluetooth/bluetooth-util.h
  78. +0
    -134
      src/modules/bluetooth/ipc.c
  79. +0
    -361
      src/modules/bluetooth/ipc.h
  80. +690
    -1060
      src/modules/bluetooth/module-bluetooth-device.c
  81. +2
    -19
      src/modules/bluetooth/module-bluetooth-discover.c
  82. +279
    -0
      src/modules/bluetooth/module-bluetooth-policy.c
  83. +1
    -1
      src/modules/bluetooth/module-bluetooth-proximity.c
  84. +0
    -1241
      src/modules/bluetooth/sbc/sbc.c
  85. +0
    -113
      src/modules/bluetooth/sbc/sbc.h
  86. +0
    -61
      src/modules/bluetooth/sbc/sbc_math.h
  87. +0
    -554
      src/modules/bluetooth/sbc/sbc_primitives.c
  88. +0
    -80
      src/modules/bluetooth/sbc/sbc_primitives.h
  89. +0
    -299
      src/modules/bluetooth/sbc/sbc_primitives_armv6.c
  90. +0
    -52
      src/modules/bluetooth/sbc/sbc_primitives_armv6.h
  91. +0
    -304
      src/modules/bluetooth/sbc/sbc_primitives_iwmmxt.c
  92. +0
    -42
      src/modules/bluetooth/sbc/sbc_primitives_iwmmxt.h
  93. +0
    -375
      src/modules/bluetooth/sbc/sbc_primitives_mmx.c
  94. +0
    -41
      src/modules/bluetooth/sbc/sbc_primitives_mmx.h
  95. +0
    -893
      src/modules/bluetooth/sbc/sbc_primitives_neon.c
  96. +0
    -41
      src/modules/bluetooth/sbc/sbc_primitives_neon.h
  97. +0
    -662
      src/modules/bluetooth/sbc/sbc_tables.h
  98. +8
    -33
      src/modules/dbus/iface-card.c
  99. +12
    -20
      src/modules/dbus/iface-device.c
  100. +3
    -3
      src/modules/dbus/module-dbus-protocol.c

+ 1
- 1
.tarball-version View File

@@ -1 +1 @@
2.1
2.99.1

+ 1
- 1
.version View File

@@ -1 +1 @@
2.1
2.99.1

+ 0
- 2
ChangeLog View File

@@ -1,2 +0,0 @@
/bin/sh: line 3: git-changelog.perl: command not found
git-changelog.perl failed.

+ 10
- 5
Makefile.in View File

@@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -245,6 +245,8 @@ FFTW_LIBS = @FFTW_LIBS@
FGREP = @FGREP@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
GCOV_CFLAGS = @GCOV_CFLAGS@
GCOV_LIBS = @GCOV_LIBS@
GDBM_CFLAGS = @GDBM_CFLAGS@
GDBM_LIBS = @GDBM_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -255,16 +257,14 @@ GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTK20_CFLAGS = @GTK20_CFLAGS@
GTK20_LIBS = @GTK20_LIBS@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HAVE_AF_UNIX = @HAVE_AF_UNIX@
HAVE_ALSA = @HAVE_ALSA@
HAVE_AVAHI = @HAVE_AVAHI@
HAVE_BLUEZ = @HAVE_BLUEZ@
HAVE_DBUS = @HAVE_DBUS@
HAVE_GLIB20 = @HAVE_GLIB20@
HAVE_HAL = @HAVE_HAL@
HAVE_MKFIFO = @HAVE_MKFIFO@
HAVE_NEON = @HAVE_NEON@
HAVE_OSS_OUTPUT = @HAVE_OSS_OUTPUT@
HAVE_SYSTEMD = @HAVE_SYSTEMD@
HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@
@@ -293,6 +293,8 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBASYNCNS_CFLAGS = @LIBASYNCNS_CFLAGS@
LIBASYNCNS_LIBS = @LIBASYNCNS_LIBS@
LIBCHECK_CFLAGS = @LIBCHECK_CFLAGS@
LIBCHECK_LIBS = @LIBCHECK_LIBS@
LIBICONV = @LIBICONV@
LIBJSON_CFLAGS = @LIBJSON_CFLAGS@
LIBJSON_LIBS = @LIBJSON_LIBS@
@@ -325,6 +327,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NEON_CFLAGS = @NEON_CFLAGS@
NM = @NM@
NMEDIT = @NMEDIT@
NODELETE_LDFLAGS = @NODELETE_LDFLAGS@
@@ -381,6 +384,8 @@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
PULSE_LOCALEDIR = @PULSE_LOCALEDIR@
RANLIB = @RANLIB@
SBC_CFLAGS = @SBC_CFLAGS@
SBC_LIBS = @SBC_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -896,7 +901,7 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
chmod -R a-w $(distdir); chmod a+w $(distdir)
chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)


+ 43
- 3
aclocal.m4 View File

@@ -1,4 +1,4 @@
# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
# generated automatically by aclocal 1.11.6 -*- Autoconf -*-

# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -1976,6 +1976,46 @@ else
fi[]dnl
])# PKG_CHECK_MODULES


# PKG_INSTALLDIR(DIRECTORY)
# -------------------------
# Substitutes the variable pkgconfigdir as the location where a module
# should install pkg-config .pc files. By default the directory is
# $libdir/pkgconfig, but the default can be changed by passing
# DIRECTORY. The user can override through the --with-pkgconfigdir
# parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
[pkg-config installation directory @<:@]pkg_default[@:>@])
AC_ARG_WITH([pkgconfigdir],
[AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
[with_pkgconfigdir=]pkg_default)
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
]) dnl PKG_INSTALLDIR


# PKG_NOARCH_INSTALLDIR(DIRECTORY)
# -------------------------
# Substitutes the variable noarch_pkgconfigdir as the location where a
# module should install arch-independent pkg-config .pc files. By
# default the directory is $datadir/pkgconfig, but the default can be
# changed by passing DIRECTORY. The user can override through the
# --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
[pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
AC_ARG_WITH([noarch-pkgconfigdir],
[AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
[with_noarch_pkgconfigdir=]pkg_default)
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
]) dnl PKG_NOARCH_INSTALLDIR

# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
# Foundation, Inc.
#
@@ -1994,7 +2034,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.5], [],
m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])

@@ -2010,7 +2050,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.5])dnl
[AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])


+ 3
- 6
config.h.in View File

@@ -29,9 +29,6 @@
/* Legacy database entry format */
#undef ENABLE_LEGACY_DATABASE_ENTRY_FORMAT

/* Legacy runtime dir */
#undef ENABLE_LEGACY_RUNTIME_DIR

/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS

@@ -167,9 +164,6 @@
/* Have GTK? */
#undef HAVE_GTK

/* Have HAL. */
#undef HAVE_HAL

/* Have HAL compatibility. */
#undef HAVE_HAL_COMPAT

@@ -233,6 +227,9 @@
/* Define to 1 if you have the `nanosleep' function. */
#undef HAVE_NANOSLEEP

/* Have NEON support? */
#undef HAVE_NEON

/* Define to 1 if you have the <netdb.h> header file. */
#undef HAVE_NETDB_H



+ 309
- 136
configure View File

@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for pulseaudio 2.1.
# Generated by GNU Autoconf 2.69 for pulseaudio 2.99.1.
#
# Report bugs to <pulseaudio-discuss (at) lists (dot) freedesktop (dot) org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='pulseaudio'
PACKAGE_TARNAME='pulseaudio'
PACKAGE_VERSION='2.1'
PACKAGE_STRING='pulseaudio 2.1'
PACKAGE_VERSION='2.99.1'
PACKAGE_STRING='pulseaudio 2.99.1'
PACKAGE_BUGREPORT='pulseaudio-discuss (at) lists (dot) freedesktop (dot) org'
PACKAGE_URL='http://pulseaudio.org/'

@@ -684,6 +684,10 @@ ORCC_FLAGS
ORCC
ORC_LIBS
ORC_CFLAGS
HAVE_GCOV_FALSE
HAVE_GCOV_TRUE
GCOV_LIBS
GCOV_CFLAGS
HAVE_XEN_FALSE
HAVE_XEN_TRUE
XEN_LIBS
@@ -710,13 +714,10 @@ UDEV_CFLAGS
HAVE_BLUEZ_FALSE
HAVE_BLUEZ_TRUE
HAVE_BLUEZ
SBC_LIBS
SBC_CFLAGS
BLUEZ_LIBS
BLUEZ_CFLAGS
HAVE_HAL_FALSE
HAVE_HAL_TRUE
HAVE_HAL
HAL_LIBS
HAL_CFLAGS
PA_MACHINE_ID_FALLBACK
PA_MACHINE_ID
HAVE_DBUS_FALSE
@@ -792,6 +793,10 @@ LIBSNDFILE_LIBS
LIBSNDFILE_CFLAGS
LIBJSON_LIBS
LIBJSON_CFLAGS
HAVE_TESTS_FALSE
HAVE_TESTS_TRUE
LIBCHECK_LIBS
LIBCHECK_CFLAGS
HAVE_X11_FALSE
HAVE_X11_TRUE
HAVE_X11
@@ -841,6 +846,10 @@ LIBTOOL
OBJDUMP
DLLTOOL
AS
HAVE_NEON_FALSE
HAVE_NEON_TRUE
NEON_CFLAGS
HAVE_NEON
NOUNDEFINED_LDFLAGS
NODELETE_LDFLAGS
IMMEDIATE_LDFLAGS
@@ -1020,6 +1029,7 @@ enable_dependency_tracking
enable_nls
enable_atomic_arm_linux_helpers
enable_atomic_arm_memory_barrier
enable_neon_opt
enable_static
enable_shared
with_pic
@@ -1032,6 +1042,7 @@ enable_rpath
with_libiconv_prefix
enable_x11
with_caps
enable_tests
enable_samplerate
with_database
enable_oss_output
@@ -1050,7 +1061,6 @@ enable_asyncns
enable_tcpwrap
enable_lirc
enable_dbus
enable_hal
enable_bluez
enable_udev
enable_hal_compat
@@ -1059,6 +1069,7 @@ enable_openssl
with_fftw
with_speex
enable_xen
enable_gcov
enable_orc
enable_systemd
enable_manpages
@@ -1072,7 +1083,6 @@ with_mac_sysroot
enable_webrtc_aec
enable_adrian_aec
enable_default_build_tests
enable_legacy_runtime_dir
enable_legacy_database_entry_format
enable_static_bins
with_preopen_mods
@@ -1098,6 +1108,8 @@ PKG_CONFIG_LIBDIR
CXXCPP
X11_CFLAGS
X11_LIBS
LIBCHECK_CFLAGS
LIBCHECK_LIBS
LIBJSON_CFLAGS
LIBJSON_LIBS
LIBSNDFILE_CFLAGS
@@ -1122,10 +1134,10 @@ LIBASYNCNS_CFLAGS
LIBASYNCNS_LIBS
DBUS_CFLAGS
DBUS_LIBS
HAL_CFLAGS
HAL_LIBS
BLUEZ_CFLAGS
BLUEZ_LIBS
SBC_CFLAGS
SBC_LIBS
UDEV_CFLAGS
UDEV_LIBS
OPENSSL_CFLAGS
@@ -1680,7 +1692,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures pulseaudio 2.1 to adapt to many kinds of systems.
\`configure' configures pulseaudio 2.99.1 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1750,7 +1762,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of pulseaudio 2.1:";;
short | recursive ) echo "Configuration of pulseaudio 2.99.1:";;
esac
cat <<\_ACEOF

@@ -1767,6 +1779,8 @@ Optional Features:
use inline asm or libatomic_ops instead
--enable-atomic-arm-memory-barrier
only really needed in SMP arm systems
--enable-neon-opt Enable NEON optimisations on ARM CPUs that support
it
--enable-static[=PKGS] build static libraries [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-fast-install[=PKGS]
@@ -1775,6 +1789,7 @@ Optional Features:
--disable-largefile omit support for large files
--disable-rpath do not hardcode runtime library paths
--disable-x11 Disable optional X11 support
--disable-tests Disable unit tests
--disable-samplerate Disable optional libsamplerate support
--disable-oss-output Disable optional OSS output support
--disable-oss-wrapper Disable optional OSS wrapper support
@@ -1793,7 +1808,6 @@ Optional Features:
--disable-tcpwrap Disable optional TCP wrappers support
--disable-lirc Disable optional LIRC support
--disable-dbus Disable optional D-Bus support
--disable-hal Disable optional HAL support
--disable-bluez Disable optional BlueZ support
--disable-udev Disable optional UDEV support
--disable-hal-compat Disable optional HAL->udev transition compatibility
@@ -1801,6 +1815,7 @@ Optional Features:
--disable-ipv6 Disable optional IPv6 support
--disable-openssl Disable OpenSSL support (used for Airtunes/RAOP)
--disable-xen Disable optional Xen paravirtualized driver
--enable-gcov Enable optional gcov coverage analysis
--enable-orc use Orc if installed
--disable-systemd Disable optional systemd support
--disable-manpages Disable building and installation of man pages
@@ -1811,8 +1826,6 @@ Optional Features:
--enable-adrian-aec Enable Adrian's optional echo canceller
--disable-default-build-tests
Build test programs only during make check
--disable-legacy-runtime-dir
Try to connect on legacy (< 0.9.12) socket paths.
--disable-legacy-database-entry-format
Try to load legacy (< 1.0) database files (card,
device and volume restore).
@@ -1875,6 +1888,10 @@ Some influential environment variables:
CXXCPP C++ preprocessor
X11_CFLAGS C compiler flags for X11, overriding pkg-config
X11_LIBS linker flags for X11, overriding pkg-config
LIBCHECK_CFLAGS
C compiler flags for LIBCHECK, overriding pkg-config
LIBCHECK_LIBS
linker flags for LIBCHECK, overriding pkg-config
LIBJSON_CFLAGS
C compiler flags for LIBJSON, overriding pkg-config
LIBJSON_LIBS
@@ -1913,11 +1930,11 @@ Some influential environment variables:
linker flags for LIBASYNCNS, overriding pkg-config
DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
DBUS_LIBS linker flags for DBUS, overriding pkg-config
HAL_CFLAGS C compiler flags for HAL, overriding pkg-config
HAL_LIBS linker flags for HAL, overriding pkg-config
BLUEZ_CFLAGS
C compiler flags for BLUEZ, overriding pkg-config
BLUEZ_LIBS linker flags for BLUEZ, overriding pkg-config
SBC_CFLAGS C compiler flags for SBC, overriding pkg-config
SBC_LIBS linker flags for SBC, overriding pkg-config
UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
UDEV_LIBS linker flags for UDEV, overriding pkg-config
OPENSSL_CFLAGS
@@ -2007,7 +2024,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
pulseaudio configure 2.1
pulseaudio configure 2.99.1
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2597,7 +2614,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by pulseaudio $as_me 2.1, which was
It was created by pulseaudio $as_me 2.99.1, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
@@ -3539,7 +3556,7 @@ fi

# Define the identity of the package.
PACKAGE='pulseaudio'
VERSION='2.1'
VERSION='2.99.1'


cat >>confdefs.h <<_ACEOF
@@ -3661,6 +3678,12 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }



if ! test -n "$VERSION"; then :

as_fn_error $? "git-version-gen failed" "$LINENO" 5

fi




@@ -3673,12 +3696,12 @@ PA_MAJORMINOR=`echo $VERSION | cut -d. -f1 | cut -d- -f1`.`echo $VERSION | cut -

PA_API_VERSION=12

PA_PROTOCOL_VERSION=26
PA_PROTOCOL_VERSION=27


# The stable ABI for client applications, for the version info x:y:z
# always will hold y=z
LIBPULSE_VERSION_INFO=14:3:14
LIBPULSE_VERSION_INFO=15:0:15


# A simplified, synchronous, ABI-stable interface for client
@@ -7617,7 +7640,7 @@ esac

#### Compiler flags ####

for flag in -Wall -W -Wextra -pipe -Wno-long-long -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option; do
for flag in -Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option; do
as_CACHEVAR=`$as_echo "ax_cv_check_cflags_-pedantic -Werror_$flag" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
@@ -8132,6 +8155,64 @@ fi
;;
esac

#### NEON optimisations ####
# Check whether --enable-neon-opt was given.
if test "${enable_neon_opt+set}" = set; then :
enableval=$enable_neon_opt;
fi


if test "x$enable_neon_opt" != "xno"; then :
save_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS -mfpu=neon"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

int
main ()
{

;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :

HAVE_NEON=1
NEON_CFLAGS="-mfpu=neon"

else

HAVE_NEON=0
NEON_CFLAGS=

fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS"

else
HAVE_NEON=0
fi

if test "x$enable_neon_opt" = "xyes" && test "x$HAVE_NEON" = "x0"; then :
as_fn_error $? "*** Compiler does not support -mfpu=neon" "$LINENO" 5
fi



if test "x$HAVE_NEON" = x1; then
HAVE_NEON_TRUE=
HAVE_NEON_FALSE='#'
else
HAVE_NEON_TRUE='#'
HAVE_NEON_FALSE=
fi

if test "x$HAVE_NEON" = "x1"; then :

$as_echo "#define HAVE_NEON 1" >>confdefs.h

fi


#### libtool stuff ####

@@ -18817,7 +18898,7 @@ fi


if test "x$LIBLTDL" = "x"; then :
as_fn_error $? "Unable to find libltdl version 2. Makes sure you have libtool 2.2 or later installed." "$LINENO" 5
as_fn_error $? "Unable to find libltdl version 2. Makes sure you have libtool 2.4 or later installed." "$LINENO" 5
fi


@@ -23052,6 +23133,106 @@ fi



#### check unit tests ####

# Check whether --enable-tests was given.
if test "${enable_tests+set}" = set; then :
enableval=$enable_tests;
fi


if test "x$enable_tests" != "xno"; then :

pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHECK" >&5
$as_echo_n "checking for LIBCHECK... " >&6; }

if test -n "$LIBCHECK_CFLAGS"; then
pkg_cv_LIBCHECK_CFLAGS="$LIBCHECK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" check \""; } >&5
($PKG_CONFIG --exists --print-errors " check ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCHECK_CFLAGS=`$PKG_CONFIG --cflags " check " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$LIBCHECK_LIBS"; then
pkg_cv_LIBCHECK_LIBS="$LIBCHECK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" check \""; } >&5
($PKG_CONFIG --exists --print-errors " check ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCHECK_LIBS=`$PKG_CONFIG --libs " check " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi



if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }

if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
LIBCHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " check " 2>&1`
else
LIBCHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " check " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBCHECK_PKG_ERRORS" >&5

HAVE_LIBCHECK=0
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
HAVE_LIBCHECK=0
else
LIBCHECK_CFLAGS=$pkg_cv_LIBCHECK_CFLAGS
LIBCHECK_LIBS=$pkg_cv_LIBCHECK_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
HAVE_LIBCHECK=1
fi
else
HAVE_LIBCHECK=0
fi




if test "x$enable_tests" = "xyes" && test "x$HAVE_LIBCHECK" = "x0"; then :
as_fn_error $? "*** check library not found" "$LINENO" 5
fi

if test "x$HAVE_LIBCHECK" = x1; then
HAVE_TESTS_TRUE=
HAVE_TESTS_FALSE='#'
else
HAVE_TESTS_TRUE='#'
HAVE_TESTS_FALSE=
fi


#### json parsing ####


@@ -24839,7 +25020,7 @@ $as_echo "#define HAVE_DBUS 1" >>confdefs.h

fi

PA_MACHINE_ID="${localstatedir}/lib/dbus/machine-id"
PA_MACHINE_ID="${sysconfdir}/machine-id"

prefix_NONE=
exec_prefix_NONE=
@@ -24857,7 +25038,7 @@ _ACEOF
test "$prefix_NONE" && prefix=NONE
test "$exec_prefix_NONE" && exec_prefix=NONE

PA_MACHINE_ID_FALLBACK="${sysconfdir}/machine-id"
PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id"

prefix_NONE=
exec_prefix_NONE=
@@ -24876,30 +25057,30 @@ _ACEOF
test "$exec_prefix_NONE" && exec_prefix=NONE


#### HAL support (optional), dependant on D-Bus ####
#### BlueZ support (optional, dependant on D-Bus) ####

# Check whether --enable-hal was given.
if test "${enable_hal+set}" = set; then :
enableval=$enable_hal;
# Check whether --enable-bluez was given.
if test "${enable_bluez+set}" = set; then :
enableval=$enable_bluez;
fi


if test "x$enable_hal" != "xno" -a \( "x$HAVE_OSS" = "x1" -o "x$HAVE_ALSA" = "x1" \); then :
if test "x$enable_bluez" != "xno"; then :

pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
$as_echo_n "checking for HAL... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLUEZ" >&5
$as_echo_n "checking for BLUEZ... " >&6; }

if test -n "$HAL_CFLAGS"; then
pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
if test -n "$BLUEZ_CFLAGS"; then
pkg_cv_BLUEZ_CFLAGS="$BLUEZ_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" hal >= 0.5.11 \""; } >&5
($PKG_CONFIG --exists --print-errors " hal >= 0.5.11 ") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" bluez >= 3.0 \""; } >&5
($PKG_CONFIG --exists --print-errors " bluez >= 3.0 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags " hal >= 0.5.11 " 2>/dev/null`
pkg_cv_BLUEZ_CFLAGS=`$PKG_CONFIG --cflags " bluez >= 3.0 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -24907,16 +25088,16 @@ fi
else
pkg_failed=untried
fi
if test -n "$HAL_LIBS"; then
pkg_cv_HAL_LIBS="$HAL_LIBS"
if test -n "$BLUEZ_LIBS"; then
pkg_cv_BLUEZ_LIBS="$BLUEZ_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" hal >= 0.5.11 \""; } >&5
($PKG_CONFIG --exists --print-errors " hal >= 0.5.11 ") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" bluez >= 3.0 \""; } >&5
($PKG_CONFIG --exists --print-errors " bluez >= 3.0 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs " hal >= 0.5.11 " 2>/dev/null`
pkg_cv_BLUEZ_LIBS=`$PKG_CONFIG --libs " bluez >= 3.0 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -24937,77 +25118,44 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " hal >= 0.5.11 " 2>&1`
BLUEZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " bluez >= 3.0 " 2>&1`
else
HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " hal >= 0.5.11 " 2>&1`
BLUEZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " bluez >= 3.0 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$HAL_PKG_ERRORS" >&5
echo "$BLUEZ_PKG_ERRORS" >&5

HAVE_HAL=0
HAVE_BLUEZ=0
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
HAVE_HAL=0
HAVE_BLUEZ=0
else
HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
HAL_LIBS=$pkg_cv_HAL_LIBS
BLUEZ_CFLAGS=$pkg_cv_BLUEZ_CFLAGS
BLUEZ_LIBS=$pkg_cv_BLUEZ_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
HAVE_HAL=1
HAVE_BLUEZ=1
fi
else
HAVE_HAL=0
fi
if test "x$HAVE_DBUS" != "x1"; then :
HAVE_HAL=0
fi

if test "x$enable_hal" = "xyes" && test "x$HAVE_HAL" = "x0"; then :
as_fn_error $? "*** HAL support not found (requires D-Bus)" "$LINENO" 5
fi




if test "x$HAVE_HAL" = x1; then
HAVE_HAL_TRUE=
HAVE_HAL_FALSE='#'
else
HAVE_HAL_TRUE='#'
HAVE_HAL_FALSE=
fi

if test "x$HAVE_HAL" = "x1"; then :

$as_echo "#define HAVE_HAL 1" >>confdefs.h

fi

#### BlueZ support (optional, dependant on D-Bus) ####

# Check whether --enable-bluez was given.
if test "${enable_bluez+set}" = set; then :
enableval=$enable_bluez;
HAVE_BLUEZ=0
fi


if test "x$enable_bluez" != "xno"; then :

pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLUEZ" >&5
$as_echo_n "checking for BLUEZ... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SBC" >&5
$as_echo_n "checking for SBC... " >&6; }

if test -n "$BLUEZ_CFLAGS"; then
pkg_cv_BLUEZ_CFLAGS="$BLUEZ_CFLAGS"
if test -n "$SBC_CFLAGS"; then
pkg_cv_SBC_CFLAGS="$SBC_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" bluez >= 3.0 \""; } >&5
($PKG_CONFIG --exists --print-errors " bluez >= 3.0 ") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" sbc >= 1.0 \""; } >&5
($PKG_CONFIG --exists --print-errors " sbc >= 1.0 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_BLUEZ_CFLAGS=`$PKG_CONFIG --cflags " bluez >= 3.0 " 2>/dev/null`
pkg_cv_SBC_CFLAGS=`$PKG_CONFIG --cflags " sbc >= 1.0 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -25015,16 +25163,16 @@ fi
else
pkg_failed=untried
fi
if test -n "$BLUEZ_LIBS"; then
pkg_cv_BLUEZ_LIBS="$BLUEZ_LIBS"
if test -n "$SBC_LIBS"; then
pkg_cv_SBC_LIBS="$SBC_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" bluez >= 3.0 \""; } >&5
($PKG_CONFIG --exists --print-errors " bluez >= 3.0 ") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" sbc >= 1.0 \""; } >&5
($PKG_CONFIG --exists --print-errors " sbc >= 1.0 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_BLUEZ_LIBS=`$PKG_CONFIG --libs " bluez >= 3.0 " 2>/dev/null`
pkg_cv_SBC_LIBS=`$PKG_CONFIG --libs " sbc >= 1.0 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -25045,12 +25193,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
BLUEZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " bluez >= 3.0 " 2>&1`
SBC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " sbc >= 1.0 " 2>&1`
else
BLUEZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " bluez >= 3.0 " 2>&1`
SBC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " sbc >= 1.0 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$BLUEZ_PKG_ERRORS" >&5
echo "$SBC_PKG_ERRORS" >&5

HAVE_BLUEZ=0
elif test $pkg_failed = untried; then
@@ -25058,8 +25206,8 @@ elif test $pkg_failed = untried; then
$as_echo "no" >&6; }
HAVE_BLUEZ=0
else
BLUEZ_CFLAGS=$pkg_cv_BLUEZ_CFLAGS
BLUEZ_LIBS=$pkg_cv_BLUEZ_LIBS
SBC_CFLAGS=$pkg_cv_SBC_CFLAGS
SBC_LIBS=$pkg_cv_SBC_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
HAVE_BLUEZ=1
@@ -25201,7 +25349,7 @@ fi


if test "x$enable_hal_compat" != "xno"; then :
if test "x$HAVE_HAL" = "x0" -a "x$HAVE_UDEV" = "x1"; then :
if test "x$HAVE_UDEV" = "x1"; then :
HAVE_HAL_COMPAT=1
else
HAVE_HAL_COMPAT=0
@@ -25210,10 +25358,6 @@ else
HAVE_HAL_COMPAT=0
fi

if test "x$enable_hal_compat" = "xyes" && test "x$HAVE_HAL_COMPAT" = "x0"; then :
as_fn_error $? "*** HAL-compat support requires UDEV and no HAL" "$LINENO" 5
fi

if test "x$HAVE_HAL_COMPAT" = x1; then
HAVE_HAL_COMPAT_TRUE=
HAVE_HAL_COMPAT_FALSE='#'
@@ -25690,6 +25834,38 @@ else
fi


#### gcov support (optional) #####

# Check whether --enable-gcov was given.
if test "${enable_gcov+set}" = set; then :
enableval=$enable_gcov;
fi


GCOV_CFLAGS=
GCOV_LIBS=" -lgcov"

if test "x$enable_gcov" = "xyes"; then :

HAVE_GCOV=1
GCOV_CFLAGS="$GCOV_CFLAGS -fprofile-arcs -ftest-coverage"
GCOV_LIBS="$GCOV_LIBS -fprofile-arcs"

else
HAVE_GCOV=0
fi



if test "x$HAVE_GCOV" = x1; then
HAVE_GCOV_TRUE=
HAVE_GCOV_FALSE='#'
else
HAVE_GCOV_TRUE='#'
HAVE_GCOV_FALSE=
fi


#### ORC (optional) ####


@@ -26344,17 +26520,6 @@ else
fi


# Check whether --enable-legacy-runtime-dir was given.
if test "${enable_legacy_runtime_dir+set}" = set; then :
enableval=$enable_legacy_runtime_dir;
fi

if test "x$enable_legacy_runtime_dir" != "xno" ; then

$as_echo "#define ENABLE_LEGACY_RUNTIME_DIR 1" >>confdefs.h

fi

# Check whether --enable-legacy-database-entry-format was given.
if test "${enable_legacy_database_entry_format+set}" = set; then :
enableval=$enable_legacy_database_entry_format;
@@ -26670,6 +26835,10 @@ if test -z "${OS_IS_WIN32_TRUE}" && test -z "${OS_IS_WIN32_FALSE}"; then
as_fn_error $? "conditional \"OS_IS_WIN32\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_NEON_TRUE}" && test -z "${HAVE_NEON_FALSE}"; then
as_fn_error $? "conditional \"HAVE_NEON\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_AF_UNIX_TRUE}" && test -z "${HAVE_AF_UNIX_FALSE}"; then
as_fn_error $? "conditional \"HAVE_AF_UNIX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -26699,6 +26868,10 @@ if test -z "${HAVE_X11_TRUE}" && test -z "${HAVE_X11_FALSE}"; then
as_fn_error $? "conditional \"HAVE_X11\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_TESTS_TRUE}" && test -z "${HAVE_TESTS_FALSE}"; then
as_fn_error $? "conditional \"HAVE_TESTS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LIBSAMPLERATE_TRUE}" && test -z "${HAVE_LIBSAMPLERATE_FALSE}"; then
as_fn_error $? "conditional \"HAVE_LIBSAMPLERATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -26775,10 +26948,6 @@ if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then
as_fn_error $? "conditional \"HAVE_DBUS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_HAL_TRUE}" && test -z "${HAVE_HAL_FALSE}"; then
as_fn_error $? "conditional \"HAVE_HAL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_BLUEZ_TRUE}" && test -z "${HAVE_BLUEZ_FALSE}"; then
as_fn_error $? "conditional \"HAVE_BLUEZ\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -26807,6 +26976,10 @@ if test -z "${HAVE_XEN_TRUE}" && test -z "${HAVE_XEN_FALSE}"; then
as_fn_error $? "conditional \"HAVE_XEN\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then
as_fn_error $? "conditional \"HAVE_GCOV\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_ORC_TRUE}" && test -z "${HAVE_ORC_FALSE}"; then
as_fn_error $? "conditional \"HAVE_ORC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27244,7 +27417,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by pulseaudio $as_me 2.1, which was
This file was extended by pulseaudio $as_me 2.99.1, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -27311,7 +27484,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
pulseaudio config.status 2.1
pulseaudio config.status 2.99.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

@@ -29498,11 +29671,6 @@ if test "x$HAVE_DBUS" = "x1"; then :
else
ENABLE_DBUS=no
fi
if test "x$HAVE_HAL" = "x1"; then :
ENABLE_HAL=yes
else
ENABLE_HAL=no
fi
if test "x$HAVE_UDEV" = "x1"; then :
ENABLE_UDEV=yes
else
@@ -29593,10 +29761,15 @@ if test "x$HAVE_ESOUND" = "x1" -a "x$USE_PER_USER_ESOUND_SOCKET" = "x1"; then :
else
ENABLE_PER_USER_ESOUND_SOCKET=no
fi
if test "x$enable_legacy_runtime_dir" != "xno"; then :
ENABLE_LEGACY_RUNTIME_DIR=yes
if test "x$HAVE_GCOV" = "x1"; then :
ENABLE_GCOV=yes
else
ENABLE_GCOV=no
fi
if test "x$HAVE_LIBCHECK" = "x1"; then :
ENABLE_TESTS=yes
else
ENABLE_LEGACY_RUNTIME_DIR=no
ENABLE_TESTS=no
fi
if test "x$enable_legacy_database_entry_format" != "xno"; then :
ENABLE_LEGACY_DATABASE_ENTRY_FORMAT=yes
@@ -29635,7 +29808,6 @@ echo "
Enable LIRC: ${ENABLE_LIRC}
Enable Xen PV driver: ${ENABLE_XEN}
Enable D-Bus: ${ENABLE_DBUS}
Enable HAL: ${ENABLE_HAL}
Enable BlueZ: ${ENABLE_BLUEZ}
Enable udev: ${ENABLE_UDEV}
Enable HAL->udev compat: ${ENABLE_HAL_COMPAT}
@@ -29649,6 +29821,8 @@ echo "
Enable Adrian echo canceller: ${ENABLE_ADRIAN_EC}
Enable speex (resampler, AEC): ${ENABLE_SPEEX}
Enable WebRTC echo canceller: ${ENABLE_WEBRTC}
Enable gcov coverage: ${ENABLE_GCOV}
Enable unit tests: ${ENABLE_TESTS}
Database
tdb: ${ENABLE_TDB}
gdbm: ${ENABLE_GDBM}
@@ -29661,7 +29835,6 @@ echo "
Force preopen: ${FORCE_PREOPEN}
Preopened modules: ${PREOPEN_MODS}

Legacy Runtime Dir Support: ${ENABLE_LEGACY_RUNTIME_DIR}
Legacy Database Entry Support: ${ENABLE_LEGACY_DATABASE_ENTRY_FORMAT}
"



+ 84
- 45
configure.ac View File

@@ -28,6 +28,10 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules color-tests dist-xz tar-ustar])

AS_IF([! test -n "$VERSION"], [
AC_MSG_ERROR([git-version-gen failed])
])

m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`)
m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)

@@ -36,11 +40,11 @@ AC_SUBST(PA_MINOR, pa_minor)
AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)

AC_SUBST(PA_API_VERSION, 12)
AC_SUBST(PA_PROTOCOL_VERSION, 26)
AC_SUBST(PA_PROTOCOL_VERSION, 27)

# The stable ABI for client applications, for the version info x:y:z
# always will hold y=z
AC_SUBST(LIBPULSE_VERSION_INFO, [14:3:14])
AC_SUBST(LIBPULSE_VERSION_INFO, [15:0:15])

# A simplified, synchronous, ABI-stable interface for client
# applications, for the version info x:y:z always will hold y=z
@@ -161,7 +165,7 @@ esac
#### Compiler flags ####

AX_APPEND_COMPILE_FLAGS(
[-Wall -W -Wextra -pipe -Wno-long-long -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option],
[-Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option],
[], [-pedantic -Werror])

# Only enable fastpath asserts when doing a debug build, e.g. from bootstrap.sh.
@@ -313,17 +317,40 @@ case $host in
;;
esac

#### NEON optimisations ####
AC_ARG_ENABLE([neon-opt],
AS_HELP_STRING([--enable-neon-opt], [Enable NEON optimisations on ARM CPUs that support it]))

AS_IF([test "x$enable_neon_opt" != "xno"],
[save_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS -mfpu=neon"
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM([], []),
[
HAVE_NEON=1
NEON_CFLAGS="-mfpu=neon"
],
[
HAVE_NEON=0
NEON_CFLAGS=
])
CFLAGS="$save_CFLAGS"
],
[HAVE_NEON=0])

AS_IF([test "x$enable_neon_opt" = "xyes" && test "x$HAVE_NEON" = "x0"],
[AC_MSG_ERROR([*** Compiler does not support -mfpu=neon])])

AC_SUBST(HAVE_NEON)
AC_SUBST(NEON_CFLAGS)
AM_CONDITIONAL([HAVE_NEON], [test "x$HAVE_NEON" = x1])
AS_IF([test "x$HAVE_NEON" = "x1"], AC_DEFINE([HAVE_NEON], 1, [Have NEON support?]))


#### libtool stuff ####

LT_PREREQ(2.2)
LT_PREREQ(2.4)
LT_INIT([dlopen win32-dll disable-static])

dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
dnl exactly which version of libltdl is present in the system, so we
dnl just assume that it's a working version as long as we have the
dnl library and the header files.
dnl
dnl As an extra safety device, check for lt_dladvise_init() which is
dnl only implemented in libtool 2.x, and refine as we go if we have
dnl refined requirements.
@@ -341,7 +368,7 @@ AC_CHECK_HEADER([ltdl.h],
[LIBLTDL=])

AS_IF([test "x$LIBLTDL" = "x"],
[AC_MSG_ERROR([Unable to find libltdl version 2. Makes sure you have libtool 2.2 or later installed.])])
[AC_MSG_ERROR([Unable to find libltdl version 2. Makes sure you have libtool 2.4 or later installed.])])
AC_SUBST([LIBLTDL])


@@ -579,6 +606,23 @@ fi

AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h])

#### check unit tests ####

AC_ARG_ENABLE([tests],
AS_HELP_STRING([--disable-tests],[Disable unit tests]))

AS_IF([test "x$enable_tests" != "xno"],
[PKG_CHECK_MODULES(LIBCHECK, [ check ], HAVE_LIBCHECK=1, HAVE_LIBCHECK=0)],
HAVE_LIBCHECK=0)

AC_SUBST(LIBCHECK_CFLAGS)
AC_SUBST(LIBCHECK_LIBS)

AS_IF([test "x$enable_tests" = "xyes" && test "x$HAVE_LIBCHECK" = "x0"],
[AC_MSG_ERROR([*** check library not found])])

AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_LIBCHECK" = x1])

#### json parsing ####

PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])
@@ -945,31 +989,12 @@ 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.]))

PA_MACHINE_ID="${localstatedir}/lib/dbus/machine-id"
PA_MACHINE_ID="${sysconfdir}/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
PA_MACHINE_ID_FALLBACK="${sysconfdir}/machine-id"
PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
[Fallback machine-id file])

#### HAL support (optional), dependant on D-Bus ####

AC_ARG_ENABLE([hal],
AS_HELP_STRING([--disable-hal],[Disable optional HAL support]))

AS_IF([test "x$enable_hal" != "xno" -a \( "x$HAVE_OSS" = "x1" -o "x$HAVE_ALSA" = "x1" \)],
[PKG_CHECK_MODULES(HAL, [ hal >= 0.5.11 ], HAVE_HAL=1, HAVE_HAL=0)],
HAVE_HAL=0)
AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_HAL=0)

AS_IF([test "x$enable_hal" = "xyes" && test "x$HAVE_HAL" = "x0"],
[AC_MSG_ERROR([*** HAL support not found (requires D-Bus)])])

AC_SUBST(HAL_CFLAGS)
AC_SUBST(HAL_LIBS)
AC_SUBST(HAVE_HAL)
AM_CONDITIONAL([HAVE_HAL], [test "x$HAVE_HAL" = x1])
AS_IF([test "x$HAVE_HAL" = "x1"], AC_DEFINE([HAVE_HAL], 1, [Have HAL.]))

#### BlueZ support (optional, dependant on D-Bus) ####

AC_ARG_ENABLE([bluez],
@@ -978,6 +1003,9 @@ AC_ARG_ENABLE([bluez],
AS_IF([test "x$enable_bluez" != "xno"],
[PKG_CHECK_MODULES(BLUEZ, [ bluez >= 3.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
HAVE_BLUEZ=0)
AS_IF([test "x$enable_bluez" != "xno"],
[PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
HAVE_BLUEZ=0)
AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ=0)

AS_IF([test "x$enable_bluez" = "xyes" && test "x$HAVE_BLUEZ" = "x0"],
@@ -1012,12 +1040,9 @@ AC_ARG_ENABLE([hal-compat],
AS_HELP_STRING([--disable-hal-compat],[Disable optional HAL->udev transition compatibility support]))

AS_IF([test "x$enable_hal_compat" != "xno"],
[AS_IF([test "x$HAVE_HAL" = "x0" -a "x$HAVE_UDEV" = "x1"], HAVE_HAL_COMPAT=1, HAVE_HAL_COMPAT=0)],
[AS_IF([test "x$HAVE_UDEV" = "x1"], HAVE_HAL_COMPAT=1, HAVE_HAL_COMPAT=0)],
HAVE_HAL_COMPAT=0)

AS_IF([test "x$enable_hal_compat" = "xyes" && test "x$HAVE_HAL_COMPAT" = "x0"],
[AC_MSG_ERROR([*** HAL-compat support requires UDEV and no HAL])])

AM_CONDITIONAL([HAVE_HAL_COMPAT], [test "x$HAVE_HAL_COMPAT" = x1])
AS_IF([test "x$HAVE_HAL_COMPAT" = "x1"], AC_DEFINE([HAVE_HAL_COMPAT], 1, [Have HAL compatibility.]))

@@ -1104,6 +1129,26 @@ AC_SUBST(XEN_CFLAGS)
AC_SUBST(XEN_LIBS)
AM_CONDITIONAL([HAVE_XEN], [test "x$HAVE_XEN" = x1])

#### gcov support (optional) #####

AC_ARG_ENABLE([gcov],
AS_HELP_STRING([--enable-gcov],[Enable optional gcov coverage analysis]))

GCOV_CFLAGS=
GCOV_LIBS=" -lgcov"

AS_IF([test "x$enable_gcov" = "xyes"],
[
HAVE_GCOV=1
GCOV_CFLAGS="$GCOV_CFLAGS -fprofile-arcs -ftest-coverage"
GCOV_LIBS="$GCOV_LIBS -fprofile-arcs"
],
HAVE_GCOV=0)

AC_SUBST(GCOV_CFLAGS)
AC_SUBST(GCOV_LIBS)
AM_CONDITIONAL([HAVE_GCOV], [test "x$HAVE_GCOV" = x1])

#### ORC (optional) ####

ORC_CHECK([0.4.11])
@@ -1250,12 +1295,6 @@ AC_ARG_ENABLE([default-build-tests],
AS_HELP_STRING([--disable-default-build-tests], [Build test programs only during make check]))
AM_CONDITIONAL([BUILD_TESTS_DEFAULT], [test "x$enable_default_build_tests" != "xno"])

AC_ARG_ENABLE([legacy-runtime-dir],
AS_HELP_STRING([--disable-legacy-runtime-dir], [Try to connect on legacy (< 0.9.12) socket paths.]))
if test "x$enable_legacy_runtime_dir" != "xno" ; then
AC_DEFINE(ENABLE_LEGACY_RUNTIME_DIR, [1], [Legacy runtime dir])
fi

AC_ARG_ENABLE([legacy-database-entry-format],
AS_HELP_STRING([--disable-legacy-database-entry-format], [Try to load legacy (< 1.0) database files (card, device and volume restore).]))
if test "x$enable_legacy_database_entry_format" != "xno" ; then
@@ -1376,7 +1415,6 @@ AS_IF([test "x$HAVE_LIBASYNCNS" = "x1"], ENABLE_LIBASYNCNS=yes, ENABLE_LIBASYNCN
AS_IF([test "x$HAVE_LIRC" = "x1"], ENABLE_LIRC=yes, ENABLE_LIRC=no)
AS_IF([test "x$HAVE_XEN" = "x1"], ENABLE_XEN=yes, ENABLE_XEN=no)
AS_IF([test "x$HAVE_DBUS" = "x1"], ENABLE_DBUS=yes, ENABLE_DBUS=no)
AS_IF([test "x$HAVE_HAL" = "x1"], ENABLE_HAL=yes, ENABLE_HAL=no)
AS_IF([test "x$HAVE_UDEV" = "x1"], ENABLE_UDEV=yes, ENABLE_UDEV=no)
AS_IF([test "x$HAVE_SYSTEMD" = "x1"], ENABLE_SYSTEMD=yes, ENABLE_SYSTEMD=no)
AS_IF([test "x$HAVE_BLUEZ" = "x1"], ENABLE_BLUEZ=yes, ENABLE_BLUEZ=no)
@@ -1395,7 +1433,8 @@ AS_IF([test "x$HAVE_GDBM" = "x1"], ENABLE_GDBM=yes, ENABLE_GDBM=no)
AS_IF([test "x$HAVE_SIMPLEDB" = "x1"], ENABLE_SIMPLEDB=yes, ENABLE_SIMPLEDB=no)
AS_IF([test "x$HAVE_ESOUND" = "x1"], ENABLE_ESOUND=yes, ENABLE_ESOUND=no)
AS_IF([test "x$HAVE_ESOUND" = "x1" -a "x$USE_PER_USER_ESOUND_SOCKET" = "x1"], ENABLE_PER_USER_ESOUND_SOCKET=yes, ENABLE_PER_USER_ESOUND_SOCKET=no)
AS_IF([test "x$enable_legacy_runtime_dir" != "xno"], ENABLE_LEGACY_RUNTIME_DIR=yes, ENABLE_LEGACY_RUNTIME_DIR=no)
AS_IF([test "x$HAVE_GCOV" = "x1"], ENABLE_GCOV=yes, ENABLE_GCOV=no)
AS_IF([test "x$HAVE_LIBCHECK" = "x1"], ENABLE_TESTS=yes, ENABLE_TESTS=no)
AS_IF([test "x$enable_legacy_database_entry_format" != "xno"], ENABLE_LEGACY_DATABASE_ENTRY_FORMAT=yes, ENABLE_LEGACY_DATABASE_ENTRY_FORMAT=no)

echo "
@@ -1429,7 +1468,6 @@ echo "
Enable LIRC: ${ENABLE_LIRC}
Enable Xen PV driver: ${ENABLE_XEN}
Enable D-Bus: ${ENABLE_DBUS}
Enable HAL: ${ENABLE_HAL}
Enable BlueZ: ${ENABLE_BLUEZ}
Enable udev: ${ENABLE_UDEV}
Enable HAL->udev compat: ${ENABLE_HAL_COMPAT}
@@ -1443,6 +1481,8 @@ echo "
Enable Adrian echo canceller: ${ENABLE_ADRIAN_EC}
Enable speex (resampler, AEC): ${ENABLE_SPEEX}
Enable WebRTC echo canceller: ${ENABLE_WEBRTC}
Enable gcov coverage: ${ENABLE_GCOV}
Enable unit tests: ${ENABLE_TESTS}
Database
tdb: ${ENABLE_TDB}
gdbm: ${ENABLE_GDBM}
@@ -1455,7 +1495,6 @@ echo "
Force preopen: ${FORCE_PREOPEN}
Preopened modules: ${PREOPEN_MODS}

Legacy Runtime Dir Support: ${ENABLE_LEGACY_RUNTIME_DIR}
Legacy Database Entry Support: ${ENABLE_LEGACY_DATABASE_ENTRY_FORMAT}
"



+ 9
- 4
doxygen/Makefile.in View File

@@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -147,6 +147,8 @@ FFTW_LIBS = @FFTW_LIBS@
FGREP = @FGREP@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
GCOV_CFLAGS = @GCOV_CFLAGS@
GCOV_LIBS = @GCOV_LIBS@
GDBM_CFLAGS = @GDBM_CFLAGS@
GDBM_LIBS = @GDBM_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -157,16 +159,14 @@ GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTK20_CFLAGS = @GTK20_CFLAGS@
GTK20_LIBS = @GTK20_LIBS@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HAVE_AF_UNIX = @HAVE_AF_UNIX@
HAVE_ALSA = @HAVE_ALSA@
HAVE_AVAHI = @HAVE_AVAHI@
HAVE_BLUEZ = @HAVE_BLUEZ@
HAVE_DBUS = @HAVE_DBUS@
HAVE_GLIB20 = @HAVE_GLIB20@
HAVE_HAL = @HAVE_HAL@
HAVE_MKFIFO = @HAVE_MKFIFO@
HAVE_NEON = @HAVE_NEON@
HAVE_OSS_OUTPUT = @HAVE_OSS_OUTPUT@
HAVE_SYSTEMD = @HAVE_SYSTEMD@
HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@
@@ -195,6 +195,8 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBASYNCNS_CFLAGS = @LIBASYNCNS_CFLAGS@
LIBASYNCNS_LIBS = @LIBASYNCNS_LIBS@
LIBCHECK_CFLAGS = @LIBCHECK_CFLAGS@
LIBCHECK_LIBS = @LIBCHECK_LIBS@
LIBICONV = @LIBICONV@
LIBJSON_CFLAGS = @LIBJSON_CFLAGS@
LIBJSON_LIBS = @LIBJSON_LIBS@
@@ -227,6 +229,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NEON_CFLAGS = @NEON_CFLAGS@
NM = @NM@
NMEDIT = @NMEDIT@
NODELETE_LDFLAGS = @NODELETE_LDFLAGS@
@@ -283,6 +286,8 @@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
PULSE_LOCALEDIR = @PULSE_LOCALEDIR@
RANLIB = @RANLIB@
SBC_CFLAGS = @SBC_CFLAGS@
SBC_LIBS = @SBC_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@


+ 12
- 2
git-version-gen View File

@@ -1,6 +1,6 @@
#!/bin/sh
# Print a version string.
scriptversion=2008-04-08.07.01
scriptversion=2012-09-25.20

# Copyright (C) 2007-2008 Free Software Foundation
#
@@ -93,6 +93,15 @@ then
&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
fi

# This is presently used by the GNOME-OSTree build system; it
# helps support the case where the meta-build system has already
# determined the git revision, but we may not be able to run "git describe"
# because we're inside a chroot.
if test -n "$GIT_DESCRIBE_FOR_BUILD";
then
v=$GIT_DESCRIBE_FOR_BUILD
fi

if test -n "$v"
then
: # use $v
@@ -133,7 +142,8 @@ then
# v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
:
else
v=UNKNOWN
echo 1>&2 "$0: Failed to determine git revision"
exit 1
fi

v=`echo "$v" |sed 's/^v//'`


+ 1
- 1
libpulse-mainloop-glib.pc.in View File

@@ -7,6 +7,6 @@ Name: libpulse-mainloop-glib
Description: PulseAudio GLib 2.0 Main Loop Wrapper
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpulse-mainloop-glib @PTHREAD_LIBS@
Libs.private: -lpulsecommon-@PA_MAJORMINOR@
Libs.private: -L${libdir}/pulseaudio -lpulsecommon-@PA_MAJORMINOR@
Cflags: -I${includedir} -D_REENTRANT
Requires: libpulse glib-2.0

+ 1
- 1
libpulse-simple.pc.in View File

@@ -7,6 +7,6 @@ Name: libpulse-simple
Description: PulseAudio Simplified Synchronous Client Interface
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpulse-simple @PTHREAD_LIBS@
Libs.private: -lpulsecommon-@PA_MAJORMINOR@
Libs.private: -L${libdir}/pulseaudio -lpulsecommon-@PA_MAJORMINOR@
Cflags: -I${includedir} -D_REENTRANT
Requires: libpulse

+ 1
- 1
libpulse.pc.in View File

@@ -8,5 +8,5 @@ Name: libpulse
Description: PulseAudio Client Interface
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpulse @PTHREAD_LIBS@
Libs.private: -lpulsecommon-@PA_MAJORMINOR@
Libs.private: -L${libdir}/pulseaudio -lpulsecommon-@PA_MAJORMINOR@
Cflags: -I${includedir} -D_REENTRANT

+ 9
- 4
man/Makefile.in View File

@@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -196,6 +196,8 @@ FFTW_LIBS = @FFTW_LIBS@
FGREP = @FGREP@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
GCOV_CFLAGS = @GCOV_CFLAGS@
GCOV_LIBS = @GCOV_LIBS@
GDBM_CFLAGS = @GDBM_CFLAGS@
GDBM_LIBS = @GDBM_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -206,16 +208,14 @@ GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTK20_CFLAGS = @GTK20_CFLAGS@
GTK20_LIBS = @GTK20_LIBS@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
HAVE_AF_UNIX = @HAVE_AF_UNIX@
HAVE_ALSA = @HAVE_ALSA@
HAVE_AVAHI = @HAVE_AVAHI@
HAVE_BLUEZ = @HAVE_BLUEZ@
HAVE_DBUS = @HAVE_DBUS@
HAVE_GLIB20 = @HAVE_GLIB20@
HAVE_HAL = @HAVE_HAL@
HAVE_MKFIFO = @HAVE_MKFIFO@
HAVE_NEON = @HAVE_NEON@
HAVE_OSS_OUTPUT = @HAVE_OSS_OUTPUT@
HAVE_SYSTEMD = @HAVE_SYSTEMD@
HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@
@@ -244,6 +244,8 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBASYNCNS_CFLAGS = @LIBASYNCNS_CFLAGS@
LIBASYNCNS_LIBS = @LIBASYNCNS_LIBS@
LIBCHECK_CFLAGS = @LIBCHECK_CFLAGS@
LIBCHECK_LIBS = @LIBCHECK_LIBS@
LIBICONV = @LIBICONV@
LIBJSON_CFLAGS = @LIBJSON_CFLAGS@
LIBJSON_LIBS = @LIBJSON_LIBS@
@@ -276,6 +278,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NEON_CFLAGS = @NEON_CFLAGS@
NM = @NM@
NMEDIT = @NMEDIT@
NODELETE_LDFLAGS = @NODELETE_LDFLAGS@
@@ -332,6 +335,8 @@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
PULSE_LOCALEDIR = @PULSE_LOCALEDIR@
RANLIB = @RANLIB@
SBC_CFLAGS = @SBC_CFLAGS@
SBC_LIBS = @SBC_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@


+ 2
- 2
man/default.pa.5 View File

@@ -2,12 +2,12 @@
.SH NAME
default.pa \- PulseAudio Sound Server Startup Script
.SH SYNOPSIS
\fB\fI~/.pulse/default.pa\fB
\fB\fI~/.config/pulse/default.pa\fB

\fI/home/arun/local/pulseaudio/etc/pulse/default.pa\fB
\f1
.SH DESCRIPTION
The PulseAudio sound server interprets the file \fI~/.pulse/default.pa\f1 on startup, and when that file doesn't exist \fI/home/arun/local/pulseaudio/etc/pulse/default.pa\f1. It should contain directives in the PulseAudio CLI languages, as documented in \fBpulse-cli-syntax(5)\f1.
The PulseAudio sound server interprets the file \fI~/.config/pulse/default.pa\f1 on startup, and when that file doesn't exist \fI/home/arun/local/pulseaudio/etc/pulse/default.pa\f1. It should contain directives in the PulseAudio CLI languages, as documented in \fBpulse-cli-syntax(5)\f1.

The same commands can also be entered during runtime in the \fBpacmd(1)\f1 tool, allowing flexible runtime reconfiguration.
.SH AUTHORS


+ 2
- 2
man/default.pa.5.xml.in View File

@@ -24,14 +24,14 @@ USA.
<manpage name="default.pa" section="5" desc="PulseAudio Sound Server Startup Script">

<synopsis>
<p><file>~/.pulse/default.pa</file></p>
<p><file>~/.config/pulse/default.pa</file></p>

<p><file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file></p>
</synopsis>

<description>
<p>The PulseAudio sound server interprets the file
<file>~/.pulse/default.pa</file> on startup, and when that file
<file>~/.config/pulse/default.pa</file> on startup, and when that file
doesn't exist <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>. It
should contain directives in the PulseAudio CLI languages, as
documented in <manref name="pulse-cli-syntax" section="5"/>.</p>


+ 1
- 1
man/pacat.1 View File

@@ -54,7 +54,7 @@ Specify the initial playback volume to use. Choose a value between 0 (silent) an
Capture or play back audio with the specified sample rate. Defaults to 44100 Hz.
.TP
\fB--format\f1\fI=FORMAT\f1
Capture or play back audio with the specified sample format. Specify one of \fBu8\f1, \fBs16le\f1, \fBs16be\f1, \fBs32le\f1, \fBs32be\f1, \fBfloat32le\f1, \fBfloat32be\f1, \fBulaw\f1, \fBalaw\f1, \fBs32le\f1, \fBs32be\f1, \fBs24le\f1, \fBs24be\f1, \fBs24-32le\f1, \fBs24-32be\f1. Depending on the endianess of the CPU the formats \fBs16ne\f1, \fBs16re\f1, \fBs32ne\f1, \fBs32re\f1, \fBfloat32ne\f1, \fBfloat32re\f1, \fBs32ne\f1, \fBs32re\f1, \fBs24ne\f1, \fBs24re\f1, \fBs24-32ne\f1, \fBs24-32re\f1 (for native, resp. reverse endian) are available as aliases. Defaults to s16ne.
Capture or play back audio with the specified sample format. Specify one of \fBu8\f1, \fBs16le\f1, \fBs16be\f1, \fBs32le\f1, \fBs32be\f1, \fBfloat32le\f1, \fBfloat32be\f1, \fBulaw\f1, \fBalaw\f1, \fBs32le\f1, \fBs32be\f1, \fBs24le\f1, \fBs24be\f1, \fBs24-32le\f1, \fBs24-32be\f1. Depending on the endianness of the CPU the formats \fBs16ne\f1, \fBs16re\f1, \fBs32ne\f1, \fBs32re\f1, \fBfloat32ne\f1, \fBfloat32re\f1, \fBs32ne\f1, \fBs32re\f1, \fBs24ne\f1, \fBs24re\f1, \fBs24-32ne\f1, \fBs24-32re\f1 (for native, resp. reverse endian) are available as aliases. Defaults to s16ne.
.TP
\fB--channels\f1\fI=CHANNELS\f1
Capture or play back audio with the specified number of channels. If more than two channels are used it is recommended to use the \fB--channel-map\f1 option below. Defaults to 2.


+ 1
- 1
man/pacat.1.xml.in View File

@@ -116,7 +116,7 @@ USA.
<opt>float32le</opt>, <opt>float32be</opt>, <opt>ulaw</opt>,
<opt>alaw</opt>, <opt>s32le</opt>, <opt>s32be</opt>,
<opt>s24le</opt>, <opt>s24be</opt>, <opt>s24-32le</opt>,
<opt>s24-32be</opt>. Depending on the endianess of the CPU the
<opt>s24-32be</opt>. Depending on the endianness of the CPU the
formats <opt>s16ne</opt>, <opt>s16re</opt>, <opt>s32ne</opt>,
<opt>s32re</opt>, <opt>float32ne</opt>, <opt>float32re</opt>,
<opt>s32ne</opt>, <opt>s32re</opt>, <opt>s24ne</opt>,


+ 5
- 2
man/pactl.1 View File

@@ -51,8 +51,8 @@ Remove the specified sample from the sample cache.
\fBload-module\f1 \fINAME\f1 [\fIARGUMENTS ...\f1]
Load the specified module with the specified arguments into the running sound server. Prints the numeric index of the module just loaded to STDOUT. You can use it to unload the module later.
.TP
\fBunload-module\f1 \fIID\f1
Unload the module instance identified by the specified numeric index.
\fBunload-module\f1 \fIID|NAME\f1
Unload the module instance identified by the specified numeric index or unload all modules by the specified name.
.TP
\fBmove-sink-input\f1 \fIID\f1 \fISINK\f1
Move the specified playback stream (identified by its numerical index) to the specified sink (identified by its symbolic name or numerical index).
@@ -75,6 +75,9 @@ Set the specified sink (identified by its symbolic name or numerical index) to t
\fBset-source-port\f1 \fISOURCE\f1 \fIPORT\f1
Set the specified source (identified by its symbolic name or numerical index) to the specified port (identified by its symbolic name).
.TP
\fBset-port-latency-offset\f1 \fICARD\f1 \fIPORT\f1 \fIOFFSET\f1
Set a latency offset to a specified port (identified by its symbolic name) that belongs to a card (identified by its symbolic name or numerical index). \fIOFFSET\f1 is a number which represents the latency offset in microseconds
.TP
\fBset-sink-volume\f1 \fISINK\f1 \fIVOLUME\f1
Set the volume of the specified sink (identified by its symbolic name or numerical index). \fIVOLUME\f1 can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage (e.g. 10%, 100%) or a decibel value (e.g. 0dB, 20dB). If the volume specification start with a + or - the volume adjustment will be relative to the current sink volume.
.TP


+ 8
- 2
man/pactl.1.xml.in View File

@@ -119,8 +119,8 @@ USA.
</option>

<option>
<p><opt>unload-module</opt> <arg>ID</arg></p>
<optdesc><p>Unload the module instance identified by the specified numeric index.</p></optdesc>
<p><opt>unload-module</opt> <arg>ID|NAME</arg></p>
<optdesc><p>Unload the module instance identified by the specified numeric index or unload all modules by the specified name.</p></optdesc>
</option>

<option>
@@ -172,6 +172,12 @@ USA.
<optdesc><p>Set the specified source (identified by its symbolic name or numerical index) to the specified port (identified by its symbolic name).</p></optdesc>
</option>

<option>
<p><opt>set-port-latency-offset</opt> <arg>CARD</arg> <arg>PORT</arg> <arg>OFFSET</arg></p>
<optdesc><p>Set a latency offset to a specified port (identified by its symbolic name) that belongs to a card (identified by its symbolic name or numerical index).
<arg>OFFSET</arg> is a number which represents the latency offset in microseconds</p></optdesc>
</option>

<option>
<p><opt>set-sink-volume</opt> <arg>SINK</arg> <arg>VOLUME</arg></p>
<optdesc><p>Set the volume of the specified sink (identified by its symbolic name or numerical index).


+ 3
- 3
man/pax11publish.1 View File

@@ -29,10 +29,10 @@ Show help.
Read the PulseAudio server credentials currently set on the X11 root window and dump them in a human readable form. This reads the PULSE_SERVER, PULSE_SINK, PULSE_SOURCE and PULSE_COOKIE properties.
.TP
\fB-i\f1
Similar to \fB-d\f1, however dumps them in a Bourne shell compatible format so they may be used together with the \fIeval\f1 shell command to set the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE environment variables. Also reads the authentication cookie from the root window and stores it in \fI~/.pulse-cookie\f1.
Similar to \fB-d\f1, however dumps them in a Bourne shell compatible format so they may be used together with the \fIeval\f1 shell command to set the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE environment variables. Also reads the authentication cookie from the root window and stores it in \fI~/.config/pulse/cookie\f1.
.TP
\fB-e\f1
Export the currently locally used sound server, sink, source configuration to the X11 root window. This takes the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE environment variables and combines them with the data from \fI~/.pulse/client.conf\f1 (or \fI/home/arun/local/pulseaudio/etc/pulse/client.conf\f1 if that file does not exist). If specific options are passed on the command line (\fB-S\f1, \fB-O\f1, \fB-I\f1, \fB-c\f1, see below), they take precedence. Also uploads the local authentication cookie \fI~/.pulse-cookie\f1 to the X11 server.
Export the currently locally used sound server, sink, source configuration to the X11 root window. This takes the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE environment variables and combines them with the data from \fI~/.config/pulse/client.conf\f1 (or \fI/home/arun/local/pulseaudio/etc/pulse/client.conf\f1 if that file does not exist). If specific options are passed on the command line (\fB-S\f1, \fB-O\f1, \fB-I\f1, \fB-c\f1, see below), they take precedence. Also uploads the local authentication cookie \fI~/.config/pulse/cookie\f1 to the X11 server.
.TP
\fB-r\f1
Removes the configured PulseAudio configuration from the X11 root window.
@@ -50,7 +50,7 @@ Only valid for \fB-e\f1: export the specified sink as default sink to the X11 di
Only valid for \fB-e\f1: export the specified source as default to the X11 display instead of the one configured via local configuration.
.TP
\fB-c\f1 \fIFILE\f1
Only valid for \fB-e\f1: export the PulseAudio authentication cookie stored in the specified file to the X11 display instead of the one stored in \fI~/.pulse-cookie\f1.
Only valid for \fB-e\f1: export the PulseAudio authentication cookie stored in the specified file to the X11 display instead of the one stored in \fI~/.config/pulse/cookie\f1.
.SH AUTHORS
The PulseAudio Developers <pulseaudio-discuss (at) lists (dot) freedesktop (dot) org>; PulseAudio is available from \fBhttp://pulseaudio.org/\f1
.SH SEE ALSO


+ 4
- 4
man/pax11publish.1.xml.in View File

@@ -73,7 +73,7 @@ USA.
the <file>eval</file> shell command to set the $PULSE_SERVER,
$PULSE_SINK, $PULSE_SOURCE environment variables. Also reads the
authentication cookie from the root window and stores it in
<file>~/.pulse-cookie</file>. </p></optdesc>
<file>~/.config/pulse/cookie</file>. </p></optdesc>
</option>

<option>
@@ -83,12 +83,12 @@ USA.
sink, source configuration to the X11 root window. This takes
the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE
environment variables and combines them with the data from
<file>~/.pulse/client.conf</file> (or
<file>~/.config/pulse/client.conf</file> (or
<file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file> if that file does not
exist). If specific options are passed on the command line
(<opt>-S</opt>, <opt>-O</opt>, <opt>-I</opt>, <opt>-c</opt>, see
below), they take precedence. Also uploads the local
authentication cookie <file>~/.pulse-cookie</file> to the X11
authentication cookie <file>~/.config/pulse/cookie</file> to the X11
server.</p></optdesc>
</option>

@@ -133,7 +133,7 @@ USA.

<optdesc><p>Only valid for <opt>-e</opt>: export the PulseAudio
authentication cookie stored in the specified file to the X11
display instead of the one stored in <file>~/.pulse-cookie</file>.</p></optdesc>
display instead of the one stored in <file>~/.config/pulse/cookie</file>.</p></optdesc>
</option>

</options>


+ 7
- 1
man/pulse-cli-syntax.5 View File

@@ -2,7 +2,7 @@
.SH NAME
pulse-cli-syntax \- PulseAudio Command Line Interface Syntax
.SH SYNOPSIS
\fB\fI~/.pulse/default.pa\fB
\fB\fI~/.config/pulse/default.pa\fB

\fI/home/arun/local/pulseaudio/etc/pulse/default.pa\fB

@@ -74,6 +74,9 @@ Change the profile of a card.
\fBset-sink-port|set-source-port\f1 \fIindex|name\f1 \fIport-name\f1
Change the profile of a sink (resp. source).
.TP
\fBset-port-latency-offset\f1 \fIcard-index|card-name\f1 \fIport-name\f1 \fIoffset\f1
Change the latency offset of a port belonging to the specified card
.TP
\fBsuspend-sink|suspend-source\f1 \fIindex|name\f1 \fIboolean\f1
Suspend (i.e. disconnect from the underlying hardware) a sink (resp. source).
.TP
@@ -124,6 +127,9 @@ Change the log level.
\fBset-log-meta\f1 \fIboolean\f1
Show source code location in log messages.
.TP
\fBset-log-target\f1 \fItarget\f1
Change the log target (null, auto, syslog, stderr, file:PATH).
.TP
\fBset-log-time\f1 \fIboolean\f1
Show timestamps in log messages.
.TP


+ 11
- 1
man/pulse-cli-syntax.5.xml.in View File

@@ -24,7 +24,7 @@ USA.
<manpage name="pulse-cli-syntax" section="5" desc="PulseAudio Command Line Interface Syntax">

<synopsis>
<p><file>~/.pulse/default.pa</file></p>
<p><file>~/.config/pulse/default.pa</file></p>
<p><file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file></p>
<p><file>@PA_DEFAULT_CONFIG_DIR@/system.pa</file></p>
</synopsis>
@@ -160,6 +160,11 @@ USA.
<optdesc><p>Change the profile of a sink (resp. source).</p></optdesc>
</option>

<option>
<p><opt>set-port-latency-offset</opt> <arg>card-index|card-name</arg> <arg>port-name</arg> <arg>offset</arg> </p>
<optdesc><p>Change the latency offset of a port belonging to the specified card</p></optdesc>
</option>

<option>
<p><opt>suspend-sink|suspend-source</opt> <arg>index|name</arg> <arg>boolean</arg></p>
<optdesc><p>Suspend (i.e. disconnect from the underlying hardware) a sink
@@ -257,6 +262,11 @@ USA.
<optdesc><p>Show source code location in log messages.</p></optdesc>
</option>

<option>
<p><opt>set-log-target</opt> <arg>target</arg></p>
<optdesc><p>Change the log target (null, auto, syslog, stderr, file:PATH).</p></optdesc>
</option>

<option>
<p><opt>set-log-time</opt> <arg>boolean</arg></p>
<optdesc><p>Show timestamps in log messages.</p></optdesc>


+ 3
- 3
man/pulse-client.conf.5 View File

@@ -2,12 +2,12 @@
.SH NAME
pulse-client.conf \- PulseAudio client configuration file
.SH SYNOPSIS
\fB\fI~/.pulse/client.conf\fB
\fB\fI~/.config/pulse/client.conf\fB

\fI/home/arun/local/pulseaudio/etc/pulse/client.conf\fB
\f1
.SH DESCRIPTION
The PulseAudio client library reads configuration directives from a file \fI~/.pulse/client.conf\f1 on startup and when that file doesn't exist from \fI/home/arun/local/pulseaudio/etc/pulse/client.conf\f1.
The PulseAudio client library reads configuration directives from a file \fI~/.config/pulse/client.conf\f1 on startup and when that file doesn't exist from \fI/home/arun/local/pulseaudio/etc/pulse/client.conf\f1.

The configuration file is a simple collection of variable declarations. If the configuration file parser encounters either ; or # it ignores the rest of the line until its end.

@@ -26,7 +26,7 @@ For the settings that take a boolean argument the values \fBtrue\f1, \fByes\f1,
.TP
\fBextra-arguments=\f1 Extra arguments to pass to the PulseAudio daemon when autospawning. Defaults to \fB--log-target=syslog\f1
.TP
\fBcookie-file=\f1 Specify the path to the PulseAudio authentication cookie. Defaults to \fI~/.pulse-cookie\f1.
\fBcookie-file=\f1 Specify the path to the PulseAudio authentication cookie. Defaults to \fI~/.config/pulse/cookie\f1.
.TP
\fBenable-shm=\f1 Enable data transfer via POSIX shared memory. Takes a boolean argument, defaults to \fByes\f1.
.TP


+ 3
- 3
man/pulse-client.conf.5.xml.in View File

@@ -24,14 +24,14 @@ USA.
<manpage name="pulse-client.conf" section="5" desc="PulseAudio client configuration file">

<synopsis>
<p><file>~/.pulse/client.conf</file></p>
<p><file>~/.config/pulse/client.conf</file></p>

<p><file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file></p>
</synopsis>

<description>
<p>The PulseAudio client library reads configuration directives from
a file <file>~/.pulse/client.conf</file> on startup and when that
a file <file>~/.config/pulse/client.conf</file> on startup and when that
file doesn't exist from
<file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file>.</p>

@@ -88,7 +88,7 @@ USA.