Hello community, here is the log from the commit of package alsa-utils for openSUSE:Factory checked in at 2013-07-20 09:03:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-utils (Old) and /work/SRC/openSUSE:Factory/.alsa-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-utils/alsa-utils.changes 2013-06-18 09:58:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-utils.new/alsa-utils.changes 2013-07-20 09:03:07.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Jul 19 15:23:41 CEST 2013 - ti...@suse.de + +- remove superfluous ca0106 file (now included in 1.0.27.2) + +------------------------------------------------------------------- +Fri Jul 19 15:13:27 CEST 2013 - ti...@suse.de + +- updated to version 1.0.27.2 + including all previous fixes +- fix a typo in alsa-state.service: + 0001-alsactl-alsa-state.service-fix-typo-rkill-kill.patch + +------------------------------------------------------------------- Old: ---- 0001-Require-alsa-lib-1.0.27.patch 0002-alsactl-init-ca0106-file-was-omitted.patch 0003-alsactl-return-back-the-udevrules_DATA-rule-for-90-a.patch 0004-amixer-Fix-the-hctl-elem-search-bug.patch 0005-amixer-fix-print_dB-for-0.99-.-0.01-range.patch 0006-amixer-Print-TLV-of-channel-map-controls.patch 0007-speaker-test-Fix-wrong-wave-file-played-back-in-chma.patch alsa-utils-1.0.27.1.tar.bz2 ca0106 New: ---- 0001-alsactl-alsa-state.service-fix-typo-rkill-kill.patch alsa-utils-1.0.27.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-utils.spec ++++++ --- /var/tmp/diff_new_pack.LkMh0V/_old 2013-07-20 09:03:08.000000000 +0200 +++ /var/tmp/diff_new_pack.LkMh0V/_new 2013-07-20 09:03:08.000000000 +0200 @@ -44,7 +44,7 @@ BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: xmlto -%define package_version 1.0.27.1 +%define package_version 1.0.27.2 Provides: alsa-conf Requires: alsa Requires: dialog @@ -52,21 +52,13 @@ Summary: Advanced Linux Sound Architecture Utilities License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players -Version: 1.0.27.1 +Version: 1.0.27.2 Release: 0 Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2 Source1: 01beep.conf -# missing in 1.0.27.1 tarball -Source99: ca0106 # Patch: alsa-utils-git-fixes.diff # upstream fix patches -Patch1: 0001-Require-alsa-lib-1.0.27.patch -Patch2: 0002-alsactl-init-ca0106-file-was-omitted.patch -Patch3: 0003-alsactl-return-back-the-udevrules_DATA-rule-for-90-a.patch -Patch4: 0004-amixer-Fix-the-hctl-elem-search-bug.patch -Patch5: 0005-amixer-fix-print_dB-for-0.99-.-0.01-range.patch -Patch6: 0006-amixer-Print-TLV-of-channel-map-controls.patch -Patch7: 0007-speaker-test-Fix-wrong-wave-file-played-back-in-chma.patch +Patch1: 0001-alsactl-alsa-state.service-fix-typo-rkill-kill.patch # Patch99: alsa-utils-gettext-version-removal.diff Url: http://www.alsa-project.org/ @@ -83,13 +75,6 @@ # rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-* # patch -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -cp %{S:99} alsactl/init # %if %suse_version < 1020 %patch99 -p1 ++++++ 0001-alsactl-alsa-state.service-fix-typo-rkill-kill.patch ++++++ >From dda4392cd5e87270db044e2838b17e2edc034dc3 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela <pe...@perex.cz> Date: Fri, 19 Jul 2013 14:36:52 +0200 Subject: [PATCH] alsactl: alsa-state.service - fix typo (rkill -> kill) Signed-off-by: Jaroslav Kysela <pe...@perex.cz> --- alsactl/alsa-state.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsactl/alsa-state.service.in b/alsactl/alsa-state.service.in index 768c5a8..56c12c1 100644 --- a/alsactl/alsa-state.service.in +++ b/alsactl/alsa-state.service.in @@ -14,4 +14,4 @@ Conflicts=shutdown.target [Service] Type=simple ExecStart=-@sbindir@/alsactl -s -n 19 -c rdaemon -ExecStop=-@sbindir@/alsactl -s rkill save_and_quit +ExecStop=-@sbindir@/alsactl -s kill save_and_quit -- 1.8.3.1 ++++++ alsa-utils-1.0.27.1.tar.bz2 -> alsa-utils-1.0.27.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/alsactl/Makefile.am new/alsa-utils-1.0.27.2/alsactl/Makefile.am --- old/alsa-utils-1.0.27.1/alsactl/Makefile.am 2013-05-21 10:48:28.000000000 +0200 +++ new/alsa-utils-1.0.27.2/alsactl/Makefile.am 2013-07-09 17:28:37.000000000 +0200 @@ -11,6 +11,9 @@ alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\" noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c +udevrules_DATA = \ + 90-alsa-restore.rules + if HAVE_SYSTEMD systemdsystemunit_DATA = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/alsactl/Makefile.in new/alsa-utils-1.0.27.2/alsactl/Makefile.in --- old/alsa-utils-1.0.27.1/alsactl/Makefile.in 2013-05-21 10:50:36.000000000 +0200 +++ new/alsa-utils-1.0.27.2/alsactl/Makefile.in 2013-07-10 09:29:36.000000000 +0200 @@ -71,7 +71,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(systemdsystemunitdir)" + "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(systemdsystemunitdir)" \ + "$(DESTDIR)$(udevrulesdir)" PROGRAMS = $(sbin_PROGRAMS) am_alsactl_OBJECTS = alsactl-alsactl.$(OBJEXT) alsactl-state.$(OBJEXT) \ alsactl-lock.$(OBJEXT) alsactl-utils.$(OBJEXT) \ @@ -133,7 +134,7 @@ man7dir = $(mandir)/man7 NROFF = nroff MANS = $(man_MANS) -DATA = $(systemdsystemunit_DATA) +DATA = $(systemdsystemunit_DATA) $(udevrules_DATA) HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -317,6 +318,9 @@ alsactl_SOURCES = alsactl.c state.c lock.c utils.c init_parse.c daemon.c alsactl_CFLAGS = $(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\" noinst_HEADERS = alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c +udevrules_DATA = \ + 90-alsa-restore.rules + @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ @HAVE_SYSTEMD_TRUE@ alsa-state.service \ @HAVE_SYSTEMD_TRUE@ alsa-restore.service \ @@ -628,6 +632,27 @@ @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(systemdsystemunitdir)'; $(am__uninstall_files_from_dir) +install-udevrulesDATA: $(udevrules_DATA) + @$(NORMAL_INSTALL) + @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(udevrulesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)" || exit 1; \ + fi; \ + 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)$(udevrulesdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \ + done + +uninstall-udevrulesDATA: + @$(NORMAL_UNINSTALL) + @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -828,7 +853,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(udevrulesdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -885,7 +910,8 @@ info-am: -install-data-am: install-man install-systemdsystemunitDATA +install-data-am: install-man install-systemdsystemunitDATA \ + install-udevrulesDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive @@ -932,7 +958,7 @@ ps-am: uninstall-am: uninstall-man uninstall-sbinPROGRAMS \ - uninstall-systemdsystemunitDATA + uninstall-systemdsystemunitDATA uninstall-udevrulesDATA uninstall-man: uninstall-man1 uninstall-man7 @@ -951,13 +977,13 @@ install-info-am install-man install-man1 install-man7 \ install-pdf install-pdf-am install-ps install-ps-am \ install-sbinPROGRAMS install-strip \ - install-systemdsystemunitDATA installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-man uninstall-man1 \ - uninstall-man7 uninstall-sbinPROGRAMS \ - uninstall-systemdsystemunitDATA + install-systemdsystemunitDATA install-udevrulesDATA \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-man7 uninstall-sbinPROGRAMS \ + uninstall-systemdsystemunitDATA uninstall-udevrulesDATA @HAVE_SYSTEMD_TRUE@install-data-hook: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/alsactl/init/Makefile.am new/alsa-utils-1.0.27.2/alsactl/init/Makefile.am --- old/alsa-utils-1.0.27.1/alsactl/init/Makefile.am 2013-05-21 10:48:28.000000000 +0200 +++ new/alsa-utils-1.0.27.2/alsactl/init/Makefile.am 2013-07-09 17:28:37.000000000 +0200 @@ -1,7 +1,7 @@ init_files = \ 00main default help info test \ - hda + hda ca0106 EXTRA_DIST = $(init_files) alsainitdir = $(datadir)/alsa/init alsainit_DATA = $(init_files) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/alsactl/init/Makefile.in new/alsa-utils-1.0.27.2/alsactl/init/Makefile.in --- old/alsa-utils-1.0.27.1/alsactl/init/Makefile.in 2013-05-21 10:50:36.000000000 +0200 +++ new/alsa-utils-1.0.27.2/alsactl/init/Makefile.in 2013-07-10 09:29:36.000000000 +0200 @@ -244,7 +244,7 @@ xmlto = @xmlto@ init_files = \ 00main default help info test \ - hda + hda ca0106 EXTRA_DIST = $(init_files) alsainitdir = $(datadir)/alsa/init diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/alsactl/init/ca0106 new/alsa-utils-1.0.27.2/alsactl/init/ca0106 --- old/alsa-utils-1.0.27.1/alsactl/init/ca0106 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-utils-1.0.27.2/alsactl/init/ca0106 2013-07-09 17:28:37.000000000 +0200 @@ -0,0 +1,31 @@ +# Configuration for CA0106 driver + +CTL{reset}="mixer" +CTL{name}="Master Playback Volume", CTL{value}="-20dB" +CTL{name}="Master Playback Switch", CTL{value}="on" +CTL{name}="Analog Front Playback Volume", CTL{value}="0dB" +CTL{name}="Analog Front Playback Switch", CTL{value}="on" +CTL{name}="Analog Rear Playback Volume", CTL{value}="0dB" +CTL{name}="Analog Rear Playback Switch", CTL{value}="on" +CTL{name}="Analog Center/LFE Playback Volume", CTL{value}="0dB" +CTL{name}="Analog Center/LFE Playback Switch", CTL{value}="on" +CTL{name}="Analog Side Playback Volume", CTL{value}="0dB" +CTL{name}="Analog Side Playback Switch", CTL{value}="on" +CTL{name}="IEC958 Front Playback Volume", CTL{value}="0dB" +CTL{name}="IEC958 Rear Playback Volume", CTL{value}="0dB" +CTL{name}="IEC958 Center/LFE Playback Volume", CTL{value}="0dB" +# capture +CTL{name}="Analog Source Capture Enum", CTL{value}="Mic" +CTL{name}="Mic Capture Volume", CTL{value}="6dB" +CTL{name}="Shared Mic/Line in Capture Switch", CTL{value}="Mic in" + +# some variants have also AC97 mixer + +CTL{reset}="mixer" +CTL{name}="AC97 Line Capture Volume",PROGRAM!="__ctl_search",GOTO="ac97_end" +CTL{name}="Analog Source Capture Enum", CTL{value}="AC97 in" +CTL{name}="AC97 Mic Capture Switch", "on" +CTL{name}="AC97 Mic Capture Value", "6dB" +LABEL="ac97_end" + +RESULT="true", EXIT="return" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/amixer/amixer.c new/alsa-utils-1.0.27.2/amixer/amixer.c --- old/alsa-utils-1.0.27.1/amixer/amixer.c 2013-05-21 10:48:28.000000000 +0200 +++ new/alsa-utils-1.0.27.2/amixer/amixer.c 2013-07-09 17:28:37.000000000 +0200 @@ -431,7 +431,11 @@ static void print_dB(long dB) { - printf("%li.%02lidB", dB / 100, (dB < 0 ? -dB : dB) % 100); + if (dB < 0) { + printf("-%li.%02lidB", -dB / 100, -dB % 100); + } else { + printf("%li.%02lidB", dB / 100, dB % 100); + } } static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_size) @@ -439,6 +443,7 @@ unsigned int type = tlv[0]; unsigned int size; unsigned int idx = 0; + const char *chmap_type = NULL; if (tlv_size < 2 * sizeof(unsigned int)) { printf("TLV size error!\n"); @@ -537,6 +542,27 @@ } break; #endif +#ifdef SND_CTL_TLVT_CHMAP_FIXED + case SND_CTL_TLVT_CHMAP_FIXED: + chmap_type = "fixed"; + /* Fall through */ + case SND_CTL_TLVT_CHMAP_VAR: + if (!chmap_type) + chmap_type = "variable"; + /* Fall through */ + case SND_CTL_TLVT_CHMAP_PAIRED: + if (!chmap_type) + chmap_type = "paired"; + printf("chmap-%s=", chmap_type); + + while (size > 0) { + printf("%s", snd_pcm_chmap_name(tlv[idx++])); + size -= sizeof(unsigned int); + if (size > 0) + printf(","); + } + break; +#endif default: printf("unk-%i-", type); while (size > 0) { @@ -1105,6 +1131,7 @@ } return err; } + snd_ctl_elem_info_get_id(info, id); /* FIXME: Remove it when hctl find works ok !!! */ if (!roflag) { snd_ctl_elem_value_set_id(control, id); if ((err = snd_ctl_elem_read(handle, control)) < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/configure new/alsa-utils-1.0.27.2/configure --- old/alsa-utils-1.0.27.1/configure 2013-05-21 10:50:37.000000000 +0200 +++ new/alsa-utils-1.0.27.2/configure 2013-07-10 09:29:37.000000000 +0200 @@ -2762,7 +2762,7 @@ # Define the identity of the package. PACKAGE=alsa-utils - VERSION=1.0.27.1 + VERSION=1.0.27.2 cat >>confdefs.h <<_ACEOF @@ -7118,7 +7118,7 @@ $as_echo "$ALSA_LIBS" >&6; } if test "x$enable_alsatest" = "xyes"; then -min_alsa_version=1.0.24 +min_alsa_version=1.0.27 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libasound headers version >= $min_alsa_version" >&5 $as_echo_n "checking for libasound headers version >= $min_alsa_version... " >&6; } no_alsa="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/configure.in new/alsa-utils-1.0.27.2/configure.in --- old/alsa-utils-1.0.27.1/configure.in 2013-05-21 10:50:34.000000000 +0200 +++ new/alsa-utils-1.0.27.2/configure.in 2013-07-10 09:29:33.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ(2.59) AC_INIT(aplay/aplay.c) AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(alsa-utils, 1.0.27.1) +AM_INIT_AUTOMAKE(alsa-utils, 1.0.27.2) AM_MAINTAINER_MODE([enable]) @@ -32,7 +32,7 @@ AC_PROG_LN_S AC_PROG_SED PKG_PROG_PKG_CONFIG -AM_PATH_ALSA(1.0.24) +AM_PATH_ALSA(1.0.27) if test "x$enable_alsatest" = "xyes"; then AC_CHECK_FUNC([snd_ctl_elem_add_enumerated], , [AC_ERROR([No user enum control support in alsa-lib])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/include/version.h new/alsa-utils-1.0.27.2/include/version.h --- old/alsa-utils-1.0.27.1/include/version.h 2013-05-21 10:50:42.000000000 +0200 +++ new/alsa-utils-1.0.27.2/include/version.h 2013-07-10 09:29:40.000000000 +0200 @@ -8,5 +8,5 @@ #define SND_UTIL_VERSION ((SND_UTIL_MAJOR<<16)|\ (SND_UTIL_MINOR<<8)|\ SND_UTIL_SUBMINOR) -#define SND_UTIL_VERSION_STR "1.0.27.1" +#define SND_UTIL_VERSION_STR "1.0.27.2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/po/alsa-utils.pot new/alsa-utils-1.0.27.2/po/alsa-utils.pot --- old/alsa-utils-1.0.27.1/po/alsa-utils.pot 2013-05-21 10:50:47.000000000 +0200 +++ new/alsa-utils-1.0.27.2/po/alsa-utils.pot 2013-07-10 09:29:44.000000000 +0200 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: alsa-utils 1.0.27.1\n" +"Project-Id-Version: alsa-utils 1.0.27.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-21 10:50+0200\n" +"POT-Creation-Date: 2013-07-10 09:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -424,7 +424,7 @@ " --fatal-errors treat all errors as fatal\n" msgstr "" -#: aplay/aplay.c:244 speaker-test/speaker-test.c:943 +#: aplay/aplay.c:244 speaker-test/speaker-test.c:951 #, c-format msgid "Recognized sample formats are:" msgstr "" @@ -1380,7 +1380,7 @@ msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1174 +#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1182 #, c-format msgid "No enough memory\n" msgstr "" @@ -1420,22 +1420,22 @@ msgid "Unsupported sample format bits %d for %s\n" msgstr "" -#: speaker-test/speaker-test.c:787 +#: speaker-test/speaker-test.c:795 #, c-format msgid "Undefined channel %d\n" msgstr "" -#: speaker-test/speaker-test.c:838 +#: speaker-test/speaker-test.c:846 #, c-format msgid "Write error: %d,%s\n" msgstr "" -#: speaker-test/speaker-test.c:840 +#: speaker-test/speaker-test.c:848 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "" -#: speaker-test/speaker-test.c:926 +#: speaker-test/speaker-test.c:934 #, c-format msgid "" "Usage: speaker-test [OPTION]... \n" @@ -1457,72 +1457,72 @@ "\n" msgstr "" -#: speaker-test/speaker-test.c:1055 +#: speaker-test/speaker-test.c:1063 #, c-format msgid "Invalid number of periods %d\n" msgstr "" -#: speaker-test/speaker-test.c:1071 speaker-test/speaker-test.c:1075 +#: speaker-test/speaker-test.c:1079 speaker-test/speaker-test.c:1083 #, c-format msgid "Invalid test type %s\n" msgstr "" -#: speaker-test/speaker-test.c:1087 +#: speaker-test/speaker-test.c:1095 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "" -#: speaker-test/speaker-test.c:1106 +#: speaker-test/speaker-test.c:1114 #, c-format msgid "Unknown option '%c'\n" msgstr "" -#: speaker-test/speaker-test.c:1120 +#: speaker-test/speaker-test.c:1128 #, c-format msgid "Playback device is %s\n" msgstr "" -#: speaker-test/speaker-test.c:1121 +#: speaker-test/speaker-test.c:1129 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "" -#: speaker-test/speaker-test.c:1124 +#: speaker-test/speaker-test.c:1132 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "" -#: speaker-test/speaker-test.c:1127 +#: speaker-test/speaker-test.c:1135 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "" -#: speaker-test/speaker-test.c:1130 +#: speaker-test/speaker-test.c:1138 #, c-format msgid "WAV file(s)\n" msgstr "" -#: speaker-test/speaker-test.c:1140 +#: speaker-test/speaker-test.c:1148 #, c-format msgid "Playback open error: %d,%s\n" msgstr "" -#: speaker-test/speaker-test.c:1146 +#: speaker-test/speaker-test.c:1154 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:1150 +#: speaker-test/speaker-test.c:1158 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:1197 speaker-test/speaker-test.c:1219 +#: speaker-test/speaker-test.c:1205 speaker-test/speaker-test.c:1227 #, c-format msgid "Transfer failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:1205 +#: speaker-test/speaker-test.c:1213 #, c-format msgid "Time per period = %lf\n" msgstr "" Files old/alsa-utils-1.0.27.1/po/de.gmo and new/alsa-utils-1.0.27.2/po/de.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/po/de.po new/alsa-utils-1.0.27.2/po/de.po --- old/alsa-utils-1.0.27.1/po/de.po 2013-05-21 10:50:47.000000000 +0200 +++ new/alsa-utils-1.0.27.2/po/de.po 2013-07-10 09:29:44.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: alsa-utils 1.0.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-21 10:50+0200\n" +"POT-Creation-Date: 2013-07-10 09:29+0200\n" "PO-Revision-Date: 2010-11-09 21:12+0100\n" "Last-Translator: Clemens Ladisch <clem...@ladisch.de>\n" "Language-Team: German\n" @@ -471,7 +471,7 @@ " --process-id-file=# schreibe Prozess-ID in diese Datei\n" " --use-strftime formatiere Dateiname mit strftime; %%v=Dateinummer\n" -#: aplay/aplay.c:244 speaker-test/speaker-test.c:943 +#: aplay/aplay.c:244 speaker-test/speaker-test.c:951 #, c-format msgid "Recognized sample formats are:" msgstr "Unterstützte Sample-Formate:" @@ -1445,7 +1445,7 @@ "Fehler beim Aufwachen aus dem Ruhezustand, Re-Initialisierung " "fehlgeschlagen: %s\n" -#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1174 +#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1182 #, c-format msgid "No enough memory\n" msgstr "Nicht genug Speicher\n" @@ -1485,22 +1485,22 @@ msgid "Unsupported sample format bits %d for %s\n" msgstr "Nicht unterstütztes Sample-Format mit %d Bits in %s\n" -#: speaker-test/speaker-test.c:787 +#: speaker-test/speaker-test.c:795 #, c-format msgid "Undefined channel %d\n" msgstr "Kanal %d nicht definiert\n" -#: speaker-test/speaker-test.c:838 +#: speaker-test/speaker-test.c:846 #, c-format msgid "Write error: %d,%s\n" msgstr "Schreibfehler: %d, %s\n" -#: speaker-test/speaker-test.c:840 +#: speaker-test/speaker-test.c:848 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "xrun_recovery fehlgeschlagen: %d, %s\n" -#: speaker-test/speaker-test.c:926 +#: speaker-test/speaker-test.c:934 #, fuzzy, c-format msgid "" "Usage: speaker-test [OPTION]... \n" @@ -1538,72 +1538,72 @@ "-W,--wavdir benutze Verzeichnis mit darin enthaltenen WAV-Dateien\n" "\n" -#: speaker-test/speaker-test.c:1055 +#: speaker-test/speaker-test.c:1063 #, c-format msgid "Invalid number of periods %d\n" msgstr "Ungültige Periodenanzahl %d\n" -#: speaker-test/speaker-test.c:1071 speaker-test/speaker-test.c:1075 +#: speaker-test/speaker-test.c:1079 speaker-test/speaker-test.c:1083 #, c-format msgid "Invalid test type %s\n" msgstr "Ungültiger Test-Typ %s\n" -#: speaker-test/speaker-test.c:1087 +#: speaker-test/speaker-test.c:1095 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "Ungültiger Wert für Option -s\n" -#: speaker-test/speaker-test.c:1106 +#: speaker-test/speaker-test.c:1114 #, c-format msgid "Unknown option '%c'\n" msgstr "Unbekannte Options '%c'\n" -#: speaker-test/speaker-test.c:1120 +#: speaker-test/speaker-test.c:1128 #, c-format msgid "Playback device is %s\n" msgstr "Wiedergabe-Gerät ist %s\n" -#: speaker-test/speaker-test.c:1121 +#: speaker-test/speaker-test.c:1129 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "Stream-Parameter sind %i Hz, %s, %i Kanäle\n" -#: speaker-test/speaker-test.c:1124 +#: speaker-test/speaker-test.c:1132 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "Verwende 16 Oktaven rosa Rauschen\n" -#: speaker-test/speaker-test.c:1127 +#: speaker-test/speaker-test.c:1135 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "Sinuswelle mit Frequenz %.4f Hz\n" -#: speaker-test/speaker-test.c:1130 +#: speaker-test/speaker-test.c:1138 #, c-format msgid "WAV file(s)\n" msgstr "WAV-Datei(en)\n" -#: speaker-test/speaker-test.c:1140 +#: speaker-test/speaker-test.c:1148 #, c-format msgid "Playback open error: %d,%s\n" msgstr "Fehler beim Öffnen des Gerätes: %d, %s\n" -#: speaker-test/speaker-test.c:1146 +#: speaker-test/speaker-test.c:1154 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "Fehler beim Setzen der Hardware-Parameter: %s\n" -#: speaker-test/speaker-test.c:1150 +#: speaker-test/speaker-test.c:1158 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "Fehler beim Setzen der Software-Parameter: %s\n" -#: speaker-test/speaker-test.c:1197 speaker-test/speaker-test.c:1219 +#: speaker-test/speaker-test.c:1205 speaker-test/speaker-test.c:1227 #, c-format msgid "Transfer failed: %s\n" msgstr "Schreibfehler: %s\n" -#: speaker-test/speaker-test.c:1205 +#: speaker-test/speaker-test.c:1213 #, c-format msgid "Time per period = %lf\n" msgstr "Zeit pro Periode = %lf\n" Files old/alsa-utils-1.0.27.1/po/fr.gmo and new/alsa-utils-1.0.27.2/po/fr.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/po/fr.po new/alsa-utils-1.0.27.2/po/fr.po --- old/alsa-utils-1.0.27.1/po/fr.po 2013-05-21 10:50:47.000000000 +0200 +++ new/alsa-utils-1.0.27.2/po/fr.po 2013-07-10 09:29:44.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: alsa-utils 1.0.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-21 10:50+0200\n" +"POT-Creation-Date: 2013-07-10 09:29+0200\n" "PO-Revision-Date: 2011-01-07 06:23+0100\n" "Last-Translator: Christoph J. Thompson <cjsthomp...@gmail.com>\n" "Language-Team: French <f...@li.org>\n" @@ -478,7 +478,7 @@ " --process-id-file écrire l'identifiant du processus ici\n" " --use-strftime utiliser strftime pour le nom du fichier de capture\n" -#: aplay/aplay.c:244 speaker-test/speaker-test.c:943 +#: aplay/aplay.c:244 speaker-test/speaker-test.c:951 #, c-format msgid "Recognized sample formats are:" msgstr "Les formats d'échantillonage connus sont:" @@ -1457,7 +1457,7 @@ msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1174 +#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1182 #, c-format msgid "No enough memory\n" msgstr "Pas assez de mémoire\n" @@ -1497,22 +1497,22 @@ msgid "Unsupported sample format bits %d for %s\n" msgstr "Le format d'échantillonage %d bits n'est pas supporté pour %s\n" -#: speaker-test/speaker-test.c:787 +#: speaker-test/speaker-test.c:795 #, c-format msgid "Undefined channel %d\n" msgstr "Canal non-défini %d\n" -#: speaker-test/speaker-test.c:838 +#: speaker-test/speaker-test.c:846 #, c-format msgid "Write error: %d,%s\n" msgstr "Erreur en écriture: %d,%s\n" -#: speaker-test/speaker-test.c:840 +#: speaker-test/speaker-test.c:848 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "" -#: speaker-test/speaker-test.c:926 +#: speaker-test/speaker-test.c:934 #, fuzzy, c-format msgid "" "Usage: speaker-test [OPTION]... \n" @@ -1551,72 +1551,72 @@ "-w,--wavdir\tSpécifier le répertoire contenant les fichiers WAV\n" "\n" -#: speaker-test/speaker-test.c:1055 +#: speaker-test/speaker-test.c:1063 #, c-format msgid "Invalid number of periods %d\n" msgstr "Nombre de périodes %d incorrect\n" -#: speaker-test/speaker-test.c:1071 speaker-test/speaker-test.c:1075 +#: speaker-test/speaker-test.c:1079 speaker-test/speaker-test.c:1083 #, c-format msgid "Invalid test type %s\n" msgstr "Type de test %s incorrect\n" -#: speaker-test/speaker-test.c:1087 +#: speaker-test/speaker-test.c:1095 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "Paramètre incorrect pour l'option -s.\n" -#: speaker-test/speaker-test.c:1106 +#: speaker-test/speaker-test.c:1114 #, c-format msgid "Unknown option '%c'\n" msgstr "Option '%c' inconnue\n" -#: speaker-test/speaker-test.c:1120 +#: speaker-test/speaker-test.c:1128 #, c-format msgid "Playback device is %s\n" msgstr "Le périphérique de lecture est %s\n" -#: speaker-test/speaker-test.c:1121 +#: speaker-test/speaker-test.c:1129 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "Les paramètres du flux sont %iHz, %s, %i canaux\n" -#: speaker-test/speaker-test.c:1124 +#: speaker-test/speaker-test.c:1132 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "Utilisation de 16 octaves de 'pink noise'\n" -#: speaker-test/speaker-test.c:1127 +#: speaker-test/speaker-test.c:1135 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "La fréquence de la courbe sinus est %.4fHz\n" -#: speaker-test/speaker-test.c:1130 +#: speaker-test/speaker-test.c:1138 #, c-format msgid "WAV file(s)\n" msgstr "fichier(s) WAV\n" -#: speaker-test/speaker-test.c:1140 +#: speaker-test/speaker-test.c:1148 #, c-format msgid "Playback open error: %d,%s\n" msgstr "Erreur d'ouverture à la lecture: %d,%s\n" -#: speaker-test/speaker-test.c:1146 +#: speaker-test/speaker-test.c:1154 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "Échec de la configuration des paramètres matériel: %s\n" -#: speaker-test/speaker-test.c:1150 +#: speaker-test/speaker-test.c:1158 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "Échec de la configuration des paramètres logiciel: %s\n" -#: speaker-test/speaker-test.c:1197 speaker-test/speaker-test.c:1219 +#: speaker-test/speaker-test.c:1205 speaker-test/speaker-test.c:1227 #, c-format msgid "Transfer failed: %s\n" msgstr "Échec du transfer: %s\n" -#: speaker-test/speaker-test.c:1205 +#: speaker-test/speaker-test.c:1213 #, c-format msgid "Time per period = %lf\n" msgstr "Temps par période = %lf\n" Files old/alsa-utils-1.0.27.1/po/ja.gmo and new/alsa-utils-1.0.27.2/po/ja.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/po/ja.po new/alsa-utils-1.0.27.2/po/ja.po --- old/alsa-utils-1.0.27.1/po/ja.po 2013-05-21 10:50:47.000000000 +0200 +++ new/alsa-utils-1.0.27.2/po/ja.po 2013-07-10 09:29:44.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: alsa-utils 1.0.9a\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-21 10:50+0200\n" +"POT-Creation-Date: 2013-07-10 09:29+0200\n" "PO-Revision-Date: 2009-05-27 15:08+0200\n" "Last-Translator: Takashi Iwai <ti...@suse.de>\n" "Language-Team: Japanese\n" @@ -468,7 +468,7 @@ " テスト範囲: coef * (buffer_size / 2)\n" " --test-nowait リングバッファのウエイトを禁止 - 注意:高CPU負荷\n" -#: aplay/aplay.c:244 speaker-test/speaker-test.c:943 +#: aplay/aplay.c:244 speaker-test/speaker-test.c:951 #, c-format msgid "Recognized sample formats are:" msgstr "認識されるサンプルフォーマット:" @@ -1428,7 +1428,7 @@ msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "サスペンドから復帰失敗: %s\n" -#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1174 +#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1182 #, c-format msgid "No enough memory\n" msgstr "メモリが足りません\n" @@ -1468,22 +1468,22 @@ msgid "Unsupported sample format bits %d for %s\n" msgstr "未サポートのサンプルフォーマットビット %d: %s\n" -#: speaker-test/speaker-test.c:787 +#: speaker-test/speaker-test.c:795 #, c-format msgid "Undefined channel %d\n" msgstr "未定義のチャネル %d\n" -#: speaker-test/speaker-test.c:838 +#: speaker-test/speaker-test.c:846 #, c-format msgid "Write error: %d,%s\n" msgstr "書込エラー: %d,%s\n" -#: speaker-test/speaker-test.c:840 +#: speaker-test/speaker-test.c:848 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "xrun_recovery 失敗: %d,%s\n" -#: speaker-test/speaker-test.c:926 +#: speaker-test/speaker-test.c:934 #, fuzzy, c-format msgid "" "Usage: speaker-test [OPTION]... \n" @@ -1522,72 +1522,72 @@ "-W,--wavdir WAVファイルのあるディレクトリを指定\n" "\n" -#: speaker-test/speaker-test.c:1055 +#: speaker-test/speaker-test.c:1063 #, c-format msgid "Invalid number of periods %d\n" msgstr "不正なピリオド数 %d\n" -#: speaker-test/speaker-test.c:1071 speaker-test/speaker-test.c:1075 +#: speaker-test/speaker-test.c:1079 speaker-test/speaker-test.c:1083 #, c-format msgid "Invalid test type %s\n" msgstr "不正なテストタイプ %s\n" -#: speaker-test/speaker-test.c:1087 +#: speaker-test/speaker-test.c:1095 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "-s オプションの値が不正です\n" -#: speaker-test/speaker-test.c:1106 +#: speaker-test/speaker-test.c:1114 #, c-format msgid "Unknown option '%c'\n" msgstr "未知のオプション '%c'\n" -#: speaker-test/speaker-test.c:1120 +#: speaker-test/speaker-test.c:1128 #, c-format msgid "Playback device is %s\n" msgstr "再生デバイス: %s\n" -#: speaker-test/speaker-test.c:1121 +#: speaker-test/speaker-test.c:1129 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "ストリームパラメータ: %iHz, %s, %i チャネル\n" -#: speaker-test/speaker-test.c:1124 +#: speaker-test/speaker-test.c:1132 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "16 オクターブのピンクノイズを使用\n" -#: speaker-test/speaker-test.c:1127 +#: speaker-test/speaker-test.c:1135 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "正弦波レート: %.4fHz\n" -#: speaker-test/speaker-test.c:1130 +#: speaker-test/speaker-test.c:1138 #, c-format msgid "WAV file(s)\n" msgstr "WAV ファイル\n" -#: speaker-test/speaker-test.c:1140 +#: speaker-test/speaker-test.c:1148 #, c-format msgid "Playback open error: %d,%s\n" msgstr "再生オープンエラー: %d,%s\n" -#: speaker-test/speaker-test.c:1146 +#: speaker-test/speaker-test.c:1154 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "hwparams の設定に失敗: %s\n" -#: speaker-test/speaker-test.c:1150 +#: speaker-test/speaker-test.c:1158 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "swparams の設定に失敗: %s\n" -#: speaker-test/speaker-test.c:1197 speaker-test/speaker-test.c:1219 +#: speaker-test/speaker-test.c:1205 speaker-test/speaker-test.c:1227 #, c-format msgid "Transfer failed: %s\n" msgstr "転送に失敗しました: %s\n" -#: speaker-test/speaker-test.c:1205 +#: speaker-test/speaker-test.c:1213 #, c-format msgid "Time per period = %lf\n" msgstr "ピリオド時間 = %lf\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.0.27.1/speaker-test/speaker-test.c new/alsa-utils-1.0.27.2/speaker-test/speaker-test.c --- old/alsa-utils-1.0.27.1/speaker-test/speaker-test.c 2013-05-21 10:48:28.000000000 +0200 +++ new/alsa-utils-1.0.27.2/speaker-test/speaker-test.c 2013-07-09 17:28:37.000000000 +0200 @@ -771,8 +771,16 @@ if (given_test_wav_file) return check_wav_file(chn, given_test_wav_file); - else - return check_wav_file(chn, wavs[chn]); + +#ifdef CONFIG_SUPPORT_CHMAP + if (channel_map_set && chn < channel_map->channels) { + int channel = channel_map->pos[chn] - SND_CHMAP_FL; + if (channel >= 0 && channel < MAX_CHANNELS) + return check_wav_file(chn, wavs[channel]); + } +#endif + + return check_wav_file(chn, wavs[chn]); } static int read_wav(uint16_t *buf, int channel, int offset, int bufsize) @@ -1179,7 +1187,7 @@ if (test_type == TEST_WAV) { for (chn = 0; chn < channels; chn++) { - if (setup_wav_file(chn) < 0) + if (setup_wav_file(get_speaker_channel(chn)) < 0) prg_exit(EXIT_FAILURE); } } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
