Hello community, here is the log from the commit of package alsa-plugins for openSUSE:Factory checked in at Wed Sep 28 14:02:25 CEST 2011.
-------- --- alsa-plugins/alsa-plugins.changes 2011-09-17 12:56:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins.changes 2011-09-27 09:57:09.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Sep 27 09:56:18 CEST 2011 - [email protected] + +- Set CLOEXEC flag to left-over fds in pulse plugin + +------------------------------------------------------------------- +Tue Sep 20 10:02:49 CEST 2011 - [email protected] + +- Install pulse plugin setup in the new config.d directory, + use the upstream default + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0008-pulse-Install-a-PulseAudio-config-snippet-into-alsa..patch 0009-Set-CLOEXEC-flag-for-pipes-in-PulseAudio-plugins.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.L7rt2K/_old 2011-09-28 14:02:21.000000000 +0200 +++ /var/tmp/diff_new_pack.L7rt2K/_new 2011-09-28 14:02:21.000000000 +0200 @@ -54,6 +54,8 @@ Patch5: 0005-jack-Fix-hanging-applications-when-using-jack-plugin.patch Patch6: 0006-pulse-only-underrun-if-no-more-data-has-been-written.patch Patch7: 0007-pulse-Define-a-dummy-PA_CHECK_VERSION-when-not-avail.patch +Patch8: 0008-pulse-Install-a-PulseAudio-config-snippet-into-alsa..patch +Patch9: 0009-Set-CLOEXEC-flag-for-pipes-in-PulseAudio-plugins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -138,6 +140,8 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build export AUTOMAKE_JOBS="%{?_smp_mflags}" @@ -188,6 +192,7 @@ %{_libdir}/alsa-lib/libasound_module_conf_pulse.so %config /etc/asound-pulse.conf %config /etc/alsa-pulse.conf +%{_datadir}/alsa/alsa.conf.d %endif %files maemo ++++++ 0008-pulse-Install-a-PulseAudio-config-snippet-into-alsa..patch ++++++ >From 84ce9d8230d19ebd67bc8db691bab74c4cbac979 Mon Sep 17 00:00:00 2001 From: Colin Guthrie <[email protected]> Date: Fri, 16 Sep 2011 10:35:17 +0100 Subject: [PATCH] pulse: Install a PulseAudio config snippet into alsa.conf.d v2: Assing priorities to the config snippets. Signed-off-by: Colin Guthrie <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- configure.in | 19 ++++++++++++++++++- pulse/50-pulseaudio.conf | 13 +++++++++++++ pulse/99-pulseaudio-default.conf.example | 13 +++++++++++++ pulse/Makefile.am | 2 ++ 4 files changed, 46 insertions(+), 1 deletions(-) create mode 100644 pulse/50-pulseaudio.conf create mode 100644 pulse/99-pulseaudio-default.conf.example diff --git a/configure.in b/configure.in index ccf59ba..3839dd5 100644 --- a/configure.in +++ b/configure.in @@ -131,10 +131,10 @@ fi AM_CONDITIONAL(HAVE_PPH, test "$PPH" = "builtin" -o "$PPH" = "lib") AM_CONDITIONAL(USE_LIBSPEEX, test "$PPH" = "lib") -dnl ALSA plugin directory test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=$prefix +dnl ALSA plugin directory AC_ARG_WITH(plugindir, AS_HELP_STRING([--with-plugindir=dir], [path where ALSA plugin files are stored]), @@ -151,6 +151,23 @@ AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "$plugindir", [directory containing ALSA add ALSA_PLUGIN_DIR="$plugindir" AC_SUBST(ALSA_PLUGIN_DIR) +dnl ALSA data directory +AC_ARG_WITH(alsadatadir, + AS_HELP_STRING([--with-alsadatadir=dir], + [path where ALSA data files are stored]), + alsadatadir="$withval", alsadatadir="") +if test -z "$alsadatadir"; then + eval dir="$datadir" + case "$dir" in + /*) ;; + *) dir="$dir" + esac + alsadatadir="$dir/alsa" +fi +AC_DEFINE_UNQUOTED(ALSA_DATA_DIR, "$alsadatadir", [directory containing ALSA data files]) +ALSA_DATA_DIR="$alsadatadir" +AC_SUBST(ALSA_DATA_DIR) + SAVE_PLUGINS_VERSION AC_OUTPUT([ diff --git a/pulse/50-pulseaudio.conf b/pulse/50-pulseaudio.conf new file mode 100644 index 0000000..dd85dab --- /dev/null +++ b/pulse/50-pulseaudio.conf @@ -0,0 +1,13 @@ +# Add a specific named PulseAudio pcm and ctl (typically useful for testing) + +pcm.pulse { + type pulse + hint { + show on + description "PulseAudio Sound Server" + } +} + +ctl.pulse { + type pulse +} diff --git a/pulse/99-pulseaudio-default.conf.example b/pulse/99-pulseaudio-default.conf.example new file mode 100644 index 0000000..4f58858 --- /dev/null +++ b/pulse/99-pulseaudio-default.conf.example @@ -0,0 +1,13 @@ +# Default to PulseAudio + +pcm.!default { + type pulse + hint { + show on + description "Default ALSA Output (currently PulseAudio Sound Server)" + } +} + +ctl.!default { + type pulse +} diff --git a/pulse/Makefile.am b/pulse/Makefile.am index e89e8ee..e184c62 100644 --- a/pulse/Makefile.am +++ b/pulse/Makefile.am @@ -1,10 +1,12 @@ asound_module_pcm_LTLIBRARIES = libasound_module_pcm_pulse.la asound_module_ctl_LTLIBRARIES = libasound_module_ctl_pulse.la asound_module_conf_LTLIBRARIES = libasound_module_conf_pulse.la +asound_module_data_DATA = 50-pulseaudio.conf 99-pulseaudio-default.conf.example asound_module_pcmdir = @ALSA_PLUGIN_DIR@ asound_module_ctldir = @ALSA_PLUGIN_DIR@ asound_module_confdir = @ALSA_PLUGIN_DIR@ +asound_module_datadir = @ALSA_DATA_DIR@/alsa.conf.d AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(PTHREAD_CFLAGS) $(pulseaudio_CFLAGS) -D_GNU_SOURCE AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) -- 1.7.6.1 ++++++ 0009-Set-CLOEXEC-flag-for-pipes-in-PulseAudio-plugins.patch ++++++ >From edfb903f625b7193c4127e91cbe641ba5f421c27 Mon Sep 17 00:00:00 2001 From: Chris Rankin <[email protected]> Date: Tue, 27 Sep 2011 09:44:15 +0200 Subject: [PATCH] Set CLOEXEC flag for pipes in PulseAudio plugins I have noticed that Alsa / PulseAudio are leaking a couple of pipes after a fork/exec, and have traced the leak to the following two plugins: libasound_module_ctl_pulse.so libasound_module_pcm_pulse.so This is with Fedora 15. I have attached a patch for the problem. Signed-off-by: Takashi Iwai <[email protected]> --- pulse/pulse.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/pulse/pulse.c b/pulse/pulse.c index c34671b..cf0546b 100644 --- a/pulse/pulse.c +++ b/pulse/pulse.c @@ -114,6 +114,11 @@ static int make_nonblock(int fd) { return fcntl(fd, F_SETFL, fl | O_NONBLOCK); } +static int make_close_on_exec(int fd) +{ + return fcntl(fd, F_SETFD, FD_CLOEXEC); +} + snd_pulse_t *pulse_new(void) { snd_pulse_t *p; @@ -134,7 +139,9 @@ snd_pulse_t *pulse_new(void) p->thread_fd = fd[1]; make_nonblock(p->main_fd); + make_close_on_exec(p->main_fd); make_nonblock(p->thread_fd); + make_close_on_exec(p->thread_fd); p->mainloop = pa_threaded_mainloop_new(); if (!p->mainloop) -- 1.7.6.1 ++++++ asound-pulse.conf ++++++ --- /var/tmp/diff_new_pack.L7rt2K/_old 2011-09-28 14:02:21.000000000 +0200 +++ /var/tmp/diff_new_pack.L7rt2K/_new 2011-09-28 14:02:21.000000000 +0200 @@ -1,18 +1,15 @@ # PulseAudio plugin configuration -# Let's create a virtual device "pulse" for mixer and PCM - -pcm.pulse { +pcm.!default { type pulse + hint { + show on + description "Default ALSA Output (currently PulseAudio Sound Server)" + } fallback "sysdefault" } -ctl.pulse { +ctl.!default { type pulse fallback "sysdefault" } - -# Let's make it the default! - -pcm.!default "pulse" -ctl.!default "pulse" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
