Commit 48d2e06b authored by Sjoerd Simons's avatar Sjoerd Simons

Imported Upstream version 1.1

parent a84448e5
All PulseAudio source files are licensed under the GNU Lesser General Public
License. (see file LGPL for details)
However, the server side links to the GPL-only library 'libsamplerate' which
practically downgrades the license of the server part to GPL (see file GPL for
details), exercising section 3 of the LGPL.
Hence you should treat the client library ('libpulse') of PulseAudio as being
LGPL licensed and the server part ('libpulsecore') as being GPL licensed. Since
the PulseAudio daemon and the modules link to 'libpulsecore' they are of course
also GPL licensed.
However, the server side has optional GPL dependencies. These include the
libsamplerate (for core libraries) and bluez (for the bluetooth proximity helper
program) libraries, although others may also be included in the future. If
PulseAudio is compiled with these optional components, this effectively
downgrades the license of the server part to GPL (see file GPL for details),
exercising section 3 of the LGPL. In such circumstances, you should treat the
client library (libpulse) of PulseAudio as being LGPL licensed and the server
part (libpulsecore) as being GPL licensed. Since the PulseAudio daemon, tests,
various utilities/helpers and the modules link to libpulsecore and/or the
afore mentioned optional GPL dependencies they are of course also GPL licensed
also in this scenario.
Andre Adrian's echo cancellation implementation is licensed under a less
restrictive license - see src/modules/echo-cancel/adrian-license.txt for
details.
-- Lennart Poettering, April 20th, 2006.
Some other files pulled into PA source (i.e. reference implementations that are
considered too small and stable to be considered as an external library) use the
more permissive MIT license. This include the device reservation DBus protocol
and realtime kit implementations.
Additionally, a more permissive Sun license is used for code that performs
u-law, A-law and linear PCM conversions.
While we attempt to provide a summary here, it is the ultimate responsibility of
the packager to ensure the components they use in their build of PulseAudio
meets their license requirements.
......@@ -51,6 +51,9 @@ pkgconfig_DATA += \
libpulse-mainloop-glib.pc
endif
cmakedir = $(libdir)/cmake/PulseAudio
cmake_DATA = PulseAudioConfig.cmake PulseAudioConfigVersion.cmake
homepage: all dist doxygen
test -d $$HOME/homepage/private
mkdir -p $$HOME/homepage/private/projects/pulseaudio $$HOME/homepage/private/projects/pulseaudio/doxygen
......
......@@ -56,8 +56,9 @@ host_triplet = @host@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/libpulse-mainloop-glib.pc.in \
$(srcdir)/Makefile.in $(srcdir)/PulseAudioConfig.cmake.in \
$(srcdir)/PulseAudioConfigVersion.cmake.in \
$(srcdir)/config.h.in $(srcdir)/libpulse-mainloop-glib.pc.in \
$(srcdir)/libpulse-simple.pc.in $(srcdir)/libpulse.pc.in \
$(top_srcdir)/configure $(top_srcdir)/src/pulse/version.h.in \
ABOUT-NLS compile config.guess config.rpath config.sub depcomp \
......@@ -82,7 +83,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = libpulse.pc libpulse-simple.pc \
libpulse-mainloop-glib.pc src/pulse/version.h
libpulse-mainloop-glib.pc src/pulse/version.h \
PulseAudioConfig.cmake PulseAudioConfigVersion.cmake
CONFIG_CLEAN_VPATH_FILES =
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
......@@ -120,8 +122,9 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(vapidir)"
DATA = $(noinst_DATA) $(pkgconfig_DATA) $(vapi_DATA)
am__installdirs = "$(DESTDIR)$(cmakedir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(vapidir)"
DATA = $(cmake_DATA) $(noinst_DATA) $(pkgconfig_DATA) $(vapi_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
......@@ -226,6 +229,7 @@ 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_OSS_OUTPUT = @HAVE_OSS_OUTPUT@
......@@ -312,6 +316,8 @@ PA_API_VERSION = @PA_API_VERSION@
PA_BINARY = @PA_BINARY@
PA_DEFAULT_CONFIG_DIR = @PA_DEFAULT_CONFIG_DIR@
PA_DLSEARCHPATH = @PA_DLSEARCHPATH@
PA_INCDIR = @PA_INCDIR@
PA_LIBDIR = @PA_LIBDIR@
PA_MACHINE_ID = @PA_MACHINE_ID@
PA_MAJOR = @PA_MAJOR@
PA_MAJORMINOR = @PA_MAJORMINOR@
......@@ -434,6 +440,8 @@ vapi_DATA = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpulse.pc libpulse-simple.pc $(am__append_1)
cmakedir = $(libdir)/cmake/PulseAudio
cmake_DATA = PulseAudioConfig.cmake PulseAudioConfigVersion.cmake
# see git-version-gen
BUILT_SOURCES = $(top_srcdir)/.version
......@@ -504,6 +512,10 @@ libpulse-mainloop-glib.pc: $(top_builddir)/config.status $(srcdir)/libpulse-main
cd $(top_builddir) && $(SHELL) ./config.status $@
src/pulse/version.h: $(top_builddir)/config.status $(top_srcdir)/src/pulse/version.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
PulseAudioConfig.cmake: $(top_builddir)/config.status $(srcdir)/PulseAudioConfig.cmake.in
cd $(top_builddir) && $(SHELL) ./config.status $@
PulseAudioConfigVersion.cmake: $(top_builddir)/config.status $(srcdir)/PulseAudioConfigVersion.cmake.in
cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
......@@ -513,6 +525,26 @@ clean-libtool:
distclean-libtool:
-rm -f libtool config.lt
install-cmakeDATA: $(cmake_DATA)
@$(NORMAL_INSTALL)
test -z "$(cmakedir)" || $(MKDIR_P) "$(DESTDIR)$(cmakedir)"
@list='$(cmake_DATA)'; test -n "$(cmakedir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cmakedir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(cmakedir)" || exit $$?; \
done
uninstall-cmakeDATA:
@$(NORMAL_UNINSTALL)
@list='$(cmake_DATA)'; test -n "$(cmakedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(cmakedir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(cmakedir)" && rm -f $$files
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
......@@ -873,7 +905,7 @@ check: $(BUILT_SOURCES)
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(vapidir)"; do \
for dir in "$(DESTDIR)$(cmakedir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(vapidir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
......@@ -927,7 +959,8 @@ info: info-recursive
info-am:
install-data-am: install-pkgconfigDATA install-vapiDATA
install-data-am: install-cmakeDATA install-pkgconfigDATA \
install-vapiDATA
install-dvi: install-dvi-recursive
......@@ -973,7 +1006,8 @@ ps: ps-recursive
ps-am:
uninstall-am: uninstall-pkgconfigDATA uninstall-vapiDATA
uninstall-am: uninstall-cmakeDATA uninstall-pkgconfigDATA \
uninstall-vapiDATA
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
ctags-recursive install install-am install-strip \
......@@ -986,16 +1020,16 @@ uninstall-am: uninstall-pkgconfigDATA uninstall-vapiDATA
dist-zip distcheck distclean distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-pkgconfigDATA install-ps \
install-ps-am install-strip install-vapiDATA installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-pkgconfigDATA \
uninstall-vapiDATA
install install-am install-cmakeDATA install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-pkgconfigDATA install-ps install-ps-am install-strip \
install-vapiDATA installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-cmakeDATA uninstall-pkgconfigDATA uninstall-vapiDATA
homepage: all dist doxygen
......
set(PULSEAUDIO_FOUND TRUE)
set(PULSEAUDIO_VERSION_MAJOR @PA_MAJOR@)
set(PULSEAUDIO_VERSION_MINOR @PA_MINOR@)
set(PULSEAUDIO_VERSION @PA_MAJOR@.@PA_MINOR@)
set(PULSEAUDIO_VERSION_STRING "@PA_MAJOR@.@PA_MINOR@")
find_path(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h HINTS "@PA_INCDIR@")
find_library(PULSEAUDIO_LIBRARY NAMES pulse libpulse HINTS "@PA_LIBDIR@")
ifelse(@HAVE_GLIB20@, 1, dnl
find_library(PULSEAUDIO_MAINLOOP_LIBRARY NAMES pulse-mainloop-glib libpulse-mainloop-glib HINTS "@PA_LIBDIR@")
)dnl
set(PACKAGE_VERSION @PA_MAJOR@.@PA_MINOR@)
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
set(PACKAGE_VERSION_COMPATIBLE TRUE)
if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
set(PACKAGE_VERSION_EXACT TRUE)
endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
......@@ -260,6 +260,10 @@ msgstr ""
[CATOBJEXT=.mo
DATADIRNAME=lib])
;;
*-*-openbsd*)
CATOBJEXT=.mo
DATADIRNAME=share
;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib
......
......@@ -564,6 +564,12 @@
/* Modules dir */
#undef PA_DLSEARCHPATH
/* PulseAudio include dir */
#undef PA_INCDIR
/* PulseAudio library dir */
#undef PA_LIBDIR
/* D-Bus machine-id file */
#undef PA_MACHINE_ID
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for pulseaudio 1.0.
# Generated by GNU Autoconf 2.68 for pulseaudio 1.1.
#
# Report bugs to <mzchyfrnhqvb (at) 0pointer (dot) net>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='pulseaudio'
PACKAGE_TARNAME='pulseaudio'
PACKAGE_VERSION='1.0'
PACKAGE_STRING='pulseaudio 1.0'
PACKAGE_VERSION='1.1'
PACKAGE_STRING='pulseaudio 1.1'
PACKAGE_BUGREPORT='mzchyfrnhqvb (at) 0pointer (dot) net'
PACKAGE_URL='http://pulseaudio.org/'
......@@ -618,6 +618,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
PA_INCDIR
PA_LIBDIR
FORCE_PREOPEN_FALSE
FORCE_PREOPEN_TRUE
udevrulesdir
......@@ -710,6 +712,7 @@ GTK20_LIBS
GTK20_CFLAGS
HAVE_GLIB20_FALSE
HAVE_GLIB20_TRUE
HAVE_GLIB20
GLIB20_LIBS
GLIB20_CFLAGS
HAVE_WAVEOUT_FALSE
......@@ -1609,7 +1612,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 1.0 to adapt to many kinds of systems.
\`configure' configures pulseaudio 1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1679,7 +1682,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of pulseaudio 1.0:";;
short | recursive ) echo "Configuration of pulseaudio 1.1:";;
esac
cat <<\_ACEOF
......@@ -1920,7 +1923,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
pulseaudio configure 1.0
pulseaudio configure 1.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2389,7 +2392,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 1.0, which was
It was created by pulseaudio $as_me 1.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
......@@ -3304,7 +3307,7 @@ fi
# Define the identity of the package.
PACKAGE='pulseaudio'
VERSION='1.0'
VERSION='1.1'
cat >>confdefs.h <<_ACEOF
......@@ -3443,7 +3446,7 @@ PA_PROTOCOL_VERSION=23
# The stable ABI for client applications, for the version info x:y:z
# always will hold y=z
LIBPULSE_VERSION_INFO=13:4:13
LIBPULSE_VERSION_INFO=13:5:13
# A simplified, synchronous, ABI-stable interface for client
......@@ -5738,7 +5741,7 @@ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcar
INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< $@'
INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
......@@ -6064,7 +6067,7 @@ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
if test $? -ne 0; then
as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
else
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
$as_echo "$IT_PERL_VERSION" >&6; }
fi
......@@ -6714,6 +6717,10 @@ else
DATADIRNAME=lib
fi
;;
*-*-openbsd*)
CATOBJEXT=.mo
DATADIRNAME=share
;;
*)
CATOBJEXT=.mo
......@@ -13798,7 +13805,7 @@ fi
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
echo '#line 13801 "configure"' > conftest.$ac_ext
echo '#line 13808 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
......@@ -20232,6 +20239,7 @@ fi
if test "x$HAVE_GLIB20" = x1; then
HAVE_GLIB20_TRUE=
HAVE_GLIB20_FALSE='#'
......@@ -22194,6 +22202,49 @@ ac_config_files="$ac_config_files src/default.pa:src/daemon/default.pa.in"
ac_config_files="$ac_config_files src/system.pa:src/daemon/system.pa.in"
# CMake related ProjectConfig files
PA_LIBDIR="$libdir"
prefix_NONE=
exec_prefix_NONE=
test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
eval ax_define_dir="\"$PA_LIBDIR\""
eval ax_define_dir="\"$ax_define_dir\""
PA_LIBDIR="$ax_define_dir"
cat >>confdefs.h <<_ACEOF
#define PA_LIBDIR "$ax_define_dir"
_ACEOF
test "$prefix_NONE" && prefix=NONE
test "$exec_prefix_NONE" && exec_prefix=NONE
PA_INCDIR="$includedir"
prefix_NONE=
exec_prefix_NONE=
test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
eval ax_define_dir="\"$PA_INCDIR\""
eval ax_define_dir="\"$ax_define_dir\""
PA_INCDIR="$ax_define_dir"
cat >>confdefs.h <<_ACEOF
#define PA_INCDIR "$ax_define_dir"
_ACEOF
test "$prefix_NONE" && prefix=NONE
test "$exec_prefix_NONE" && exec_prefix=NONE
ac_config_files="$ac_config_files PulseAudioConfig.cmake:PulseAudioConfig.cmake.in"
ac_config_files="$ac_config_files PulseAudioConfigVersion.cmake"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
......@@ -22893,7 +22944,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 1.0, which was
This file was extended by pulseaudio $as_me 1.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -22960,7 +23011,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 1.0
pulseaudio config.status 1.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
......@@ -23404,6 +23455,8 @@ do
"src/daemon.conf") CONFIG_FILES="$CONFIG_FILES src/daemon.conf:src/daemon/daemon.conf.in" ;;
"src/default.pa") CONFIG_FILES="$CONFIG_FILES src/default.pa:src/daemon/default.pa.in" ;;
"src/system.pa") CONFIG_FILES="$CONFIG_FILES src/system.pa:src/daemon/system.pa.in" ;;
"PulseAudioConfig.cmake") CONFIG_FILES="$CONFIG_FILES PulseAudioConfig.cmake:PulseAudioConfig.cmake.in" ;;
"PulseAudioConfigVersion.cmake") CONFIG_FILES="$CONFIG_FILES PulseAudioConfigVersion.cmake" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
......@@ -24738,6 +24791,7 @@ fi
"src/daemon.conf":F) m4 src/daemon.conf > src/daemon.conf.gen && mv src/daemon.conf.gen src/daemon.conf ;;
"src/default.pa":F) m4 src/default.pa > src/default.pa.gen && mv src/default.pa.gen src/default.pa ;;
"src/system.pa":F) m4 src/system.pa > src/system.pa.gen && mv src/system.pa.gen src/system.pa ;;
"PulseAudioConfig.cmake":F) m4 PulseAudioConfig.cmake > PulseAudioConfig.cmake.gen && mv PulseAudioConfig.cmake.gen PulseAudioConfig.cmake ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
......
......@@ -40,7 +40,7 @@ AC_SUBST(PA_PROTOCOL_VERSION, 23)
# The stable ABI for client applications, for the version info x:y:z
# always will hold y=z
AC_SUBST(LIBPULSE_VERSION_INFO, [13:4:13])
AC_SUBST(LIBPULSE_VERSION_INFO, [13:5:13])
# A simplified, synchronous, ABI-stable interface for client
# applications, for the version info x:y:z always will hold y=z
......@@ -776,6 +776,7 @@ AS_IF([test "x$enable_glib2" = "xyes" && test "x$HAVE_GLIB20" = "x0"],
AC_SUBST(GLIB20_CFLAGS)
AC_SUBST(GLIB20_LIBS)
AC_SUBST(HAVE_GLIB20)
AM_CONDITIONAL([HAVE_GLIB20], [test "x$HAVE_GLIB20" = x1])
AS_IF([test "x$HAVE_GLIB20" = "x1"], AC_DEFINE([HAVE_GLIB], 1, [Have GLIB?]))
......@@ -1246,6 +1247,16 @@ AC_CONFIG_FILES([src/default.pa:src/daemon/default.pa.in],
AC_CONFIG_FILES([src/system.pa:src/daemon/system.pa.in],
[m4 src/system.pa > src/system.pa.gen && mv src/system.pa.gen src/system.pa])
# CMake related ProjectConfig files
PA_LIBDIR="$libdir"
AX_DEFINE_DIR(PA_LIBDIR, PA_LIBDIR, [PulseAudio library dir])
PA_INCDIR="$includedir"
AX_DEFINE_DIR(PA_INCDIR, PA_INCDIR, [PulseAudio include dir])
AC_CONFIG_FILES([PulseAudioConfig.cmake:PulseAudioConfig.cmake.in],
[m4 PulseAudioConfig.cmake > PulseAudioConfig.cmake.gen && mv PulseAudioConfig.cmake.gen PulseAudioConfig.cmake])
AC_CONFIG_FILES([PulseAudioConfigVersion.cmake])
AC_OUTPUT
# ==========================================================================
......
......@@ -141,6 +141,7 @@ 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_OSS_OUTPUT = @HAVE_OSS_OUTPUT@
......@@ -227,6 +228,8 @@ PA_API_VERSION = @PA_API_VERSION@
PA_BINARY = @PA_BINARY@
PA_DEFAULT_CONFIG_DIR = @PA_DEFAULT_CONFIG_DIR@
PA_DLSEARCHPATH = @PA_DLSEARCHPATH@
PA_INCDIR = @PA_INCDIR@
PA_LIBDIR = @PA_LIBDIR@
PA_MACHINE_ID = @PA_MACHINE_ID@
PA_MAJOR = @PA_MAJOR@
PA_MAJORMINOR = @PA_MAJORMINOR@
......
......@@ -66,7 +66,7 @@ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcar
INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@'
INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
......@@ -119,7 +119,7 @@ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
if test $? -ne 0; then
AC_MSG_ERROR([perl 5.8.1 is required for intltool])
else
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
AC_MSG_RESULT([$IT_PERL_VERSION])
fi
if test "x$2" != "xno-xml"; then
......
......@@ -183,6 +183,7 @@ 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_OSS_OUTPUT = @HAVE_OSS_OUTPUT@
......@@ -269,6 +270,8 @@ PA_API_VERSION = @PA_API_VERSION@
PA_BINARY = @PA_BINARY@
PA_DEFAULT_CONFIG_DIR = @PA_DEFAULT_CONFIG_DIR@
PA_DLSEARCHPATH = @PA_DLSEARCHPATH@
PA_INCDIR = @PA_INCDIR@
PA_LIBDIR = @PA_LIBDIR@
PA_MACHINE_ID = @PA_MACHINE_ID@
PA_MAJOR = @PA_MAJOR@
PA_MAJORMINOR = @PA_MAJORMINOR@
......
......@@ -49,8 +49,8 @@ MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
ALL_LINGUAS = @ALL_LINGUAS@
......
......@@ -244,7 +244,6 @@ TESTS = \
TESTS_norun = \
mcalign-test \
once-test \
pacat-simple \
parec-simple \
extended-test \
......@@ -262,6 +261,11 @@ TESTS += \
usergroup-test
endif
if !OS_IS_DARWIN
TESTS_norun += \
once-test
endif
if HAVE_SIGXCPU
TESTS_norun += \
cpulimit-test \
......@@ -590,9 +594,9 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
pulsecore/sndfile-util.c pulsecore/sndfile-util.h \
pulsecore/socket.h
libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS)
libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
if HAVE_X11
libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \
......@@ -1609,7 +1613,7 @@ module_zeroconf_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
module_bonjour_publish_la_SOURCES = modules/macosx/module-bonjour-publish.c
module_bonjour_publish_la_LDFLAGS = $(MODULE_LDFLAGS) \
-Wl,-framework -Wl,CoreFoundation -framework CoreFoundation
module_bonjour_publish_la_LIBADD = $(MODULE_LIBADD)
module_bonjour_publish_la_LIBADD = $(MODULE_LIBADD) libprotocol-native.la
# LIRC
......
This diff is collapsed.
......@@ -81,7 +81,9 @@ load-module module-detect
### Automatically connect sink and source if JACK server is present
.ifexists module-jackdbus-detect@PA_SOEXT@
.nofail
load-module module-jackdbus-detect
.fail
.endif
ifelse(@HAVE_BLUEZ@, 1, [dnl
......
......@@ -1107,14 +1107,14 @@ int main(int argc, char *argv[]) {
#ifdef HAVE_DBUS
if (!conf->system_instance) {
if (!(server_lookup = pa_dbusobj_server_lookup_new(c)))
goto finish;
if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
goto finish;
if ((server_lookup = pa_dbusobj_server_lookup_new(c))) {
if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
goto finish;
}
}
if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server")))
goto finish;
if (start_server)
server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server");
#endif
#ifdef HAVE_FORK
......
......@@ -485,7 +485,7 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) {
sl->path_registered = FALSE;
if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
pa_log("Unable to contact D-Bus: %s: %s", error.name, error.message);
pa_log_warn("Unable to contact D-Bus: %s: %s", error.name, error.message);
goto fail;
}
......
......@@ -271,7 +271,7 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) {
struct pollfd *p;
unsigned n_fds;
unsigned short revents = 0;
int err;
int err, ret = 0;
pd = pa_rtpoll_item_get_userdata(i);
pa_assert_fp(pd);
......@@ -281,17 +281,42 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) {
if ((err = snd_mixer_poll_descriptors_revents(pd->mixer, p, n_fds, &revents)) < 0) {
pa_log_error("Unable to get poll revent: %s", pa_alsa_strerror(err));
pa_rtpoll_item_free(i);
return -1;
ret = -1;
goto fail;
}
if (revents) {
snd_mixer_handle_events(pd->mixer);
pa_rtpoll_item_free(i);
pa_alsa_set_mixer_rtpoll(pd, pd->mixer, pd->rtpoll);
if (revents & (POLLNVAL | POLLERR)) {
pa_log_debug("Device disconnected, stopping poll on mixer");
goto fail;
} else if (revents & POLLERR) {
/* This shouldn't happen. */
pa_log_error("Got a POLLERR (revents = %04x), stopping poll on mixer", revents);
goto fail;
}
err = snd_mixer_handle_events(pd->mixer);
if (PA_LIKELY(err >= 0)) {
pa_rtpoll_item_free(i);
pa_alsa_set_mixer_rtpoll(pd, pd->mixer, pd->rtpoll);
} else {
pa_log_error("Error handling mixer event: %s", pa_alsa_strerror(err));
ret = -1;
goto fail;
}
}
return 0;
return ret;
fail:
pa_rtpoll_item_free(i);
pd->poll_item = NULL;
pd->rtpoll = NULL;
pd->mixer = NULL;
return ret;
}
int pa_alsa_set_mixer_rtpoll(struct pa_alsa_mixer_pdata *pd, snd_mixer_t *mixer, pa_rtpoll *rtp) {
......
......@@ -1534,8 +1534,20 @@ static pa_bool_t sink_set_formats(pa_sink *s, pa_idxset *formats) {
pa_idxset_free(u->formats, (pa_free2_cb_t) pa_format_info_free2, NULL);
u->formats = pa_idxset_new(NULL, NULL);
/* Note: the logic below won't apply if we're using software encoding.
* This is fine for now since we don't support that via the passthrough
* framework, but this must be changed if we do. */
/* First insert non-PCM formats since we prefer those. */
PA_IDXSET_FOREACH(f, formats, idx) {
pa_idxset_put(u->formats, pa_format_info_copy(f), NULL);
if (!pa_format_info_is_pcm(f))
pa_idxset_put(u->formats, pa_format_info_copy(f), NULL);
}
/* Now add any PCM formats */
PA_IDXSET_FOREACH(f, formats, idx) {
if (pa_format_info_is_pcm(f))
pa_idxset_put(u->formats, pa_format_info_copy(f), NULL);
}
return TRUE;
......@@ -1698,8 +1710,12 @@ static void thread_func(void *userdata) {
if (u->sink->flags & PA_SINK_DEFERRED_VOLUME) {
pa_usec_t volume_sleep;
pa_sink_volume_change_apply(u->sink, &volume_sleep);
if (volume_sleep > 0)
rtpoll_sleep = PA_MIN(volume_sleep, rtpoll_sleep);