./0000775000175000017500000000000012621056603011436 5ustar nielsenrnielsenr./alsa-utils-aplay-interrupt-signal-handling.patch0000664000175000017500000000241112511507002022716 0ustar nielsenrnielsenrUpstream-Status: Pending aplay/arecord (alsa-utils v1.0.28) cannot interrupt streaming via CTRL-C. Fixed the issue by reverting buggy patches and properly handling 'in_aborting' flag in appropriate functions. Signed-off-by: Anant Agrawal Signed-off-by: Mikhail Durnev --- a/aplay/aplay.c 2014-05-19 16:25:14.000000000 +0530 +++ b/aplay/aplay.c 2014-05-20 15:17:14.364823007 +0530 @@ -392,14 +392,22 @@ putchar('\n'); if (!quiet_mode) fprintf(stderr, _("Aborted by signal %s...\n"), strsignal(sig)); - if (handle) + if (stream == SND_PCM_STREAM_CAPTURE) { + if (fmt_rec_table[file_type].end) { + fmt_rec_table[file_type].end(fd); + fd = -1; + } + stream = -1; + } + if (fd > 1) { + close(fd); + fd = -1; + } + if (handle && sig != SIGABRT) { snd_pcm_abort(handle); - if (sig == SIGABRT) { - /* do not call snd_pcm_close() and abort immediately */ handle = NULL; - prg_exit(EXIT_FAILURE); } - signal(sig, signal_handler); + prg_exit(EXIT_FAILURE); } /* call on SIGUSR1 signal. */ @@ -2096,7 +2104,7 @@ ssize_t result = count, r; size_t size; - while (count > 0) { + while (count > 0 && !in_aborting) { size = count; if (size > chunk_bytes - buffer_pos) size = chunk_bytes - buffer_pos; ./0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch0000664000175000017500000000315212511507002025075 0ustar nielsenrnielsenrFrom 43a56fa36a12f09ccd78b3cf5e6ae197fcab501f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 Aug 2014 18:58:56 +0300 Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing This avoids an error on bootup Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 Upstream-Status: Pending Signed-off-by: Koen Kooi Signed-off-by: Cristian Iorga --- alsactl/Makefile.am | 7 ++++--- alsactl/alsa-restore.service.in | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index 47f06e9..b728c06 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -43,9 +43,10 @@ install-data-hook: endif edit = \ - $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ - -e 's,@mydatadir\@,$(mydatadir),g' \ - -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ + $(SED) -e 's,@localstatedir\@,$(localstatedir),g' \ + -e 's,@sbindir\@,$(sbindir),g' \ + -e 's,@mydatadir\@,$(mydatadir),g' \ + -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ < $< > $@ || rm $@ alsa-state.service: alsa-state.service.in diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in index 245a439..b017854 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in @@ -10,6 +10,7 @@ DefaultDependencies=no After=alsa-state.service Before=shutdown.target Conflicts=shutdown.target +ConditionPathExists=@localstatedir@/lib/alsa/asound.state [Service] Type=oneshot -- 1.9.1