From: frank Date: Mon, 16 Jan 2012 06:50:11 +0000 (+0100) Subject: committing changes in /etc after emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=b62b28e81df1cdcef043f51ffc72013fd83cad91;p=config%2Fbruni%2Fetc.git committing changes in /etc after emerge run Package changes: +media-sound/pulseaudio-0.9.22-r2 --- diff --git a/.etckeeper b/.etckeeper index 1302db24..16c2cf25 100755 --- a/.etckeeper +++ b/.etckeeper @@ -160,6 +160,7 @@ maybe chmod 0644 './dbus-1/system.d/org.freedesktop.ModemManager.conf' maybe chmod 0644 './dbus-1/system.d/org.freedesktop.PolicyKit1.conf' maybe chmod 0644 './dbus-1/system.d/org.freedesktop.UDisks.conf' maybe chmod 0644 './dbus-1/system.d/org.gnome.GConf.Defaults.conf' +maybe chmod 0644 './dbus-1/system.d/pulseaudio-system.conf' maybe chmod 0644 './dbus-1/system.d/wpa_supplicant.conf' maybe chmod 0755 './default' maybe chmod 0600 './default/useradd' @@ -599,6 +600,11 @@ maybe chmod 0644 './profile.d/java-config-2.csh' maybe chmod 0644 './profile.d/java-config-2.sh' maybe chmod 0644 './profile.env' maybe chmod 0644 './protocols' +maybe chmod 0755 './pulse' +maybe chmod 0644 './pulse/client.conf' +maybe chmod 0644 './pulse/daemon.conf' +maybe chmod 0644 './pulse/default.pa' +maybe chmod 0644 './pulse/system.pa' maybe chmod 0755 './qt4' maybe chmod 0644 './qt4/.keep_x11-libs_qt-core-4' maybe chmod 0644 './rc.conf' @@ -764,6 +770,8 @@ maybe chmod 0644 './xdg/autostart/gnome-keyring-secrets.desktop' maybe chmod 0644 './xdg/autostart/gnome-keyring-ssh.desktop' maybe chmod 0644 './xdg/autostart/gsettings-data-convert.desktop' maybe chmod 0644 './xdg/autostart/polkit-gnome-authentication-agent-1.desktop' +maybe chmod 0644 './xdg/autostart/pulseaudio-kde.desktop' +maybe chmod 0644 './xdg/autostart/pulseaudio.desktop' maybe chmod 0644 './xinetd.conf' maybe chmod 0755 './xinetd.d' maybe chmod 0644 './xinetd.d/chargen-dgram' diff --git a/dbus-1/system.d/pulseaudio-system.conf b/dbus-1/system.d/pulseaudio-system.conf new file mode 100644 index 00000000..edddaf93 --- /dev/null +++ b/dbus-1/system.d/pulseaudio-system.conf @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + diff --git a/pulse/client.conf b/pulse/client.conf new file mode 100644 index 00000000..b3738abf --- /dev/null +++ b/pulse/client.conf @@ -0,0 +1,33 @@ +# 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. + +## Configuration file for PulseAudio clients. See pulse-client.conf(5) for +## more information. Default values a commented out. Use either ; or # for +## commenting. + +; default-sink = +; default-source = +; default-server = + +; autospawn = yes +; daemon-binary = /usr/bin/pulseaudio +; extra-arguments = --log-target=syslog + +; cookie-file = + +; enable-shm = yes +; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB diff --git a/pulse/daemon.conf b/pulse/daemon.conf new file mode 100644 index 00000000..e058f497 --- /dev/null +++ b/pulse/daemon.conf @@ -0,0 +1,81 @@ +# 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. + +## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for +## more information. Default values a commented out. Use either ; or # for +## commenting. + +; daemonize = no +; fail = yes +; allow-module-loading = yes +; allow-exit = yes +; use-pid-file = yes +; system-instance = no +; enable-shm = yes +; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB +; lock-memory = no +; cpu-limit = no + +; high-priority = yes +; nice-level = -11 + +; realtime-scheduling = yes +; realtime-priority = 5 + +; exit-idle-time = 20 +; scache-idle-time = 20 + +; dl-search-path = (depends on architecture) + +; load-default-script-file = yes +; default-script-file = + +; log-target = auto +; log-level = notice +; log-meta = no +; log-time = no +; log-backtrace = 0 + +; resample-method = speex-float-3 +; enable-remixing = yes +; enable-lfe-remixing = no + +; flat-volumes = yes + +; rlimit-fsize = -1 +; rlimit-data = -1 +; rlimit-stack = -1 +; rlimit-core = -1 +; rlimit-as = -1 +; rlimit-rss = -1 +; rlimit-nproc = -1 +; rlimit-nofile = 256 +; rlimit-memlock = -1 +; rlimit-locks = -1 +; rlimit-sigpending = -1 +; rlimit-msgqueue = -1 +; rlimit-nice = 31 +; rlimit-rtprio = 9 +; rlimit-rttime = 1000000 + +; default-sample-format = s16le +; default-sample-rate = 44100 +; default-sample-channels = 2 +; default-channel-map = front-left,front-right + +; default-fragments = 4 +; default-fragment-size-msec = 25 diff --git a/pulse/default.pa b/pulse/default.pa new file mode 100644 index 00000000..33179fd6 --- /dev/null +++ b/pulse/default.pa @@ -0,0 +1,137 @@ +#!/usr/bin/pulseaudio -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 per-user +# (i.e. not in system mode) + +.nofail + +### Load something into the sample cache +#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav +#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav +#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav +#load-sample-lazy pulse-access /usr/share/sounds/generic.wav + +.fail + +### Automatically restore the volume of streams and devices +load-module module-device-restore +load-module module-stream-restore +load-module module-card-restore + +### Automatically augment property information from .desktop files +### stored in /usr/share/application +load-module module-augment-properties + +### Load audio drivers statically (it's probably better to not load +### these drivers manually, but instead use module-hal-detect -- +### see below -- for doing this automatically) +#load-module module-alsa-sink +#load-module module-alsa-source device=hw:1,0 +#load-module module-oss device="/dev/dsp" sink_name=output source_name=input +#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input +#load-module module-null-sink +#load-module module-pipe-sink + +### Automatically load driver modules depending on the hardware available +.ifexists module-udev-detect.so +load-module module-udev-detect +.else +### Alternatively use the static hardware detection module (for systems that +### lack udev support) +load-module module-detect +.endif + +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-discover.so +load-module module-bluetooth-discover +.endif + +### Load several protocols +.ifexists module-esound-protocol-unix.so +load-module module-esound-protocol-unix +.endif +load-module module-native-protocol-unix + +### Network access (may be configured with paprefs, so leave this commented +### here if you plan to use paprefs) +#load-module module-esound-protocol-tcp +#load-module module-native-protocol-tcp +#load-module module-zeroconf-publish + +### Load the RTP reciever module (also configured via paprefs, see above) +#load-module module-rtp-recv + +### Load the RTP sender module (also configured via paprefs, see above) +#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink" +#load-module module-rtp-send source=rtp.monitor + +### Load additional modules from GConf settings. This can be configured with the paprefs tool. +### Please keep in mind that the modules configured by paprefs might conflict with manually +### loaded modules. +.ifexists module-gconf.so +.nofail +load-module module-gconf +.fail +.endif + +### 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 + +### Honour intended role device property +load-module module-intended-roles + +### Automatically suspend sinks/sources that become idle for too long +load-module module-suspend-on-idle + +### If autoexit on idle is enabled we want to make sure we only quit +### when no local session needs us anymore. +load-module module-console-kit + +### Enable positioned event sounds +load-module module-position-event-sounds + +### Cork music streams when a phone stream is active +load-module module-cork-music-on-phone + +# X11 modules should not be started from default.pa so that one daemon +# can be shared by multiple sessions. + +### Load X11 bell module +#load-module module-x11-bell sample=bell-windowing-system + +### Register ourselves in the X11 session manager +#load-module module-x11-xsmp + +### Publish connection data in the X11 root window +#.ifexists module-x11-publish.so +#.nofail +#load-module module-x11-publish +#.fail +#.endif + +### Make some devices default +#set-default-sink output +#set-default-source input diff --git a/pulse/system.pa b/pulse/system.pa new file mode 100644 index 00000000..23a9857a --- /dev/null +++ b/pulse/system.pa @@ -0,0 +1,55 @@ +#!/usr/bin/pulseaudio -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.so +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.so +load-module module-esound-protocol-unix +.endif +load-module module-native-protocol-unix + +### Automatically restore the volume of streams and devices +load-module module-stream-restore +load-module module-device-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 diff --git a/xdg/autostart/pulseaudio-kde.desktop b/xdg/autostart/pulseaudio-kde.desktop new file mode 100644 index 00000000..137efa12 --- /dev/null +++ b/xdg/autostart/pulseaudio-kde.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=PulseAudio Sound System KDE Routing Policy +Comment=Start the PulseAudio Sound System with KDE Routing Policy +Exec=start-pulseaudio-kde +Terminal=false +Type=Application +Categories= +GenericName= +OnlyShowIn=KDE; diff --git a/xdg/autostart/pulseaudio.desktop b/xdg/autostart/pulseaudio.desktop new file mode 100644 index 00000000..a3d14fd2 --- /dev/null +++ b/xdg/autostart/pulseaudio.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=PulseAudio Sound System +Name[de]=PulseAudio Sound System +Comment=Start the PulseAudio Sound System +Comment[de]=Das PulseAudio Sound System starten +Exec=start-pulseaudio-x11 +Terminal=false +Type=Application +Categories= +GenericName=