[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.11-7-gc39a0bf
Lennart Poettering
gitmailer-noreply at 0pointer.de
Wed Jul 30 08:01:35 PDT 2008
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from 90569d37a03b1b0cfcb9dbe0a431184c873e7481 (commit)
- Log -----------------------------------------------------------------
c39a0bf... bump needed automake version
881046b... install a default system.pa
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
src/.gitignore | 1 +
src/Makefile.am | 10 +++++++-
src/daemon/default.pa.in | 3 ++
src/daemon/system.pa.in | 54 ++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 68 insertions(+), 2 deletions(-)
create mode 100755 src/daemon/system.pa.in
-----------------------------------------------------------------------
commit 881046b730125cdb24a5bd8fac9d18901c66b523
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jul 30 16:59:30 2008 +0200
install a default system.pa
diff --git a/src/.gitignore b/src/.gitignore
index 33a9f25..6902eb9 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -15,6 +15,7 @@ cpulimit-test
cpulimit-test2
daemon.conf
default.pa
+system.pa
envelope-test
esdcompat
flist-test
diff --git a/src/Makefile.am b/src/Makefile.am
index 98d06aa..36bfdca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,6 +96,7 @@ EXTRA_DIST = \
pulse/version.h.in \
daemon/daemon.conf.in \
daemon/default.pa.in \
+ daemon/system.pa.in \
daemon/default.pa.win32 \
depmod.py \
daemon/esdcompat.in \
@@ -108,6 +109,7 @@ EXTRA_DIST = \
pulseconf_DATA = \
default.pa \
+ system.pa \
daemon.conf \
client.conf
@@ -1543,7 +1545,7 @@ suid: pulseaudio .libs/lt-pulseaudio
chown root $^
chmod u+s $^
-CLEANFILES = esdcompat client.conf default.pa daemon.conf start-pulseaudio-x11
+CLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11
esdcompat: daemon/esdcompat.in Makefile
sed -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
@@ -1562,11 +1564,17 @@ client.conf: pulse/client.conf.in Makefile
if OS_IS_WIN32
default.pa: daemon/default.pa.win32
cp $< $@
+system.pa: daemon/default.pa.win32
+ cp $< $@
else
default.pa: daemon/default.pa.in Makefile
sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' \
-e 's, at PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
-e 's, at PA_SOEXT\@,.so,g' < $< > $@
+system.pa: daemon/system.pa.in Makefile
+ sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' \
+ -e 's, at PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
+ -e 's, at PA_SOEXT\@,.so,g' < $< > $@
endif
daemon.conf: daemon/daemon.conf.in Makefile
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 498499e..917fc30 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -16,6 +16,9 @@
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# This startup script is used only if PulseAudio is started per-user
+# (i.e. not in system mode)
+
.nofail
### Load something into the sample cache
diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in
new file mode 100755
index 0000000..f6052c4
--- /dev/null
+++ b/src/daemon/system.pa.in
@@ -0,0 +1,54 @@
+#!@PA_BINARY@ -nF
+#
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+# This startup script is used only if PulseAudio is started in system
+# mode.
+
+### Automatically load driver modules depending on the hardware available
+.ifexists module-hal-detect at PA_SOEXT@
+load-module module-hal-detect
+.else
+### Alternatively use the static hardware detection module (for systems that
+### lack HAL support)
+load-module module-detect
+.endif
+
+### Load several protocols
+.ifexists module-esound-protocol-unix at PA_SOEXT@
+load-module module-esound-protocol-unix
+.endif
+load-module module-native-protocol-unix
+
+### Automatically restore the volume of playback streams
+load-module module-volume-restore
+
+### Automatically restore the default sink/source when changed by the user during runtime
+load-module module-default-device-restore
+
+### Automatically move streams to the default sink if the sink they are
+### connected to dies, similar for sources
+load-module module-rescue-streams
+
+### Make sure we always have a sink around, even if it is a null sink.
+load-module module-always-sink
+
+### Automatically suspend sinks/sources that become idle for too long
+load-module module-suspend-on-idle
+
+### Enable positioned event sounds
+load-module module-position-event-sounds
commit c39a0bf627c6152f8dfff783057000badd76abff
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jul 30 17:01:31 2008 +0200
bump needed automake version
diff --git a/configure.ac b/configure.ac
index 8417375..2ea4d89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ m4_define(PA_MICRO, [11])
AC_INIT([pulseaudio], PA_MAJOR.PA_MINOR.PA_MICRO,[mzchyfrnhqvb (at) 0pointer (dot) net])
AC_CONFIG_SRCDIR([src/daemon/main.c])
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([foreign -Wall])
+AM_INIT_AUTOMAKE([foreign 1.10 -Wall])
AC_SUBST(PA_MAJORMINOR, "PA_MAJOR.PA_MINOR")
AC_SUBST(PACKAGE_URL, [http://pulseaudio.org/])
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list