Hello community,
here is the log from the commit of package alsa-utils
checked in at Tue Jun 5 00:44:58 CEST 2007.
--------
--- alsa-utils/alsa-utils.changes 2007-05-24 13:07:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/alsa-utils/alsa-utils.changes 2007-05-31 12:26:25.000000000 +0200
@@ -1,0 +2,6 @@
+Thu May 31 12:26:10 CEST 2007 - tiwai@suse.de
+
+- updated to version 1.0.14-final
+ including previous HG fixes
+
+-------------------------------------------------------------------
Old:
----
alsa-utils-1.0.14rc4.tar.bz2
alsa-utils-hg-fixes.diff
New:
----
alsa-utils-1.0.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa-utils.spec ++++++
--- /var/tmp/diff_new_pack.J24881/_old 2007-06-05 00:44:50.000000000 +0200
+++ /var/tmp/diff_new_pack.J24881/_new 2007-06-05 00:44:50.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package alsa-utils (Version 1.0.13)
+# spec file for package alsa-utils (Version 1.0.14)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,17 +12,17 @@
Name: alsa-utils
BuildRequires: alsa-devel ncurses-devel
-%define package_version 1.0.14rc4
+%define package_version 1.0.14
License: GNU General Public License (GPL)
Group: Productivity/Multimedia/Sound/Players
Provides: alsa-conf
Requires: dialog pciutils
Autoreqprov: on
Summary: Advanced Linux Sound Architecture Utilities
-Version: 1.0.13
-Release: 10
+Version: 1.0.14
+Release: 1
Source: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2
-Patch: alsa-utils-hg-fixes.diff
+# Patch: alsa-utils-hg-fixes.diff
URL: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -38,8 +38,8 @@
Takashi Iwai
%prep
-%setup -n %{name}-%{package_version}
-%patch -p1
+%setup -q -n %{name}-%{package_version}
+# %patch -p1
mv alsamixer/README alsamixer/README-alsamixer
%{?suse_update_config:%{suse_update_config -f .}}
@@ -69,6 +69,9 @@
%{_datadir}/alsa
%changelog
+* Thu May 31 2007 - tiwai@suse.de
+- updated to version 1.0.14-final
+ including previous HG fixes
* Thu May 24 2007 - tiwai@suse.de
- HG patch as of 2007.05.24:
* more error verbose messages in alsactl
++++++ alsa-utils-1.0.14rc4.tar.bz2 -> alsa-utils-1.0.14.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.14rc4/alsactl/alsactl.c new/alsa-utils-1.0.14/alsactl/alsactl.c
--- old/alsa-utils-1.0.14rc4/alsactl/alsactl.c 2007-05-02 10:04:48.000000000 +0200
+++ new/alsa-utils-1.0.14/alsactl/alsactl.c 2007-05-31 10:07:21.000000000 +0200
@@ -41,16 +41,18 @@
{
printf("Usage: alsactl <options> command\n");
printf("\nAvailable options:\n");
- printf(" -h,--help this help\n");
- printf(" -f,--file # configuration file (default " SYS_ASOUNDRC " or " SYS_ASOUNDNAMES ")\n");
- printf(" -F,--force try to restore the matching controls as much as possible\n");
- printf(" -d,--debug debug mode\n");
- printf(" -v,--version print version of this program\n");
+ printf(" -h,--help this help\n");
+ printf(" -f,--file # configuration file (default " SYS_ASOUNDRC " or " SYS_ASOUNDNAMES ")\n");
+ printf(" -F,--force try to restore the matching controls as much as possible\n");
+ printf(" -d,--debug debug mode\n");
+ printf(" -v,--version print version of this program\n");
printf("\nAvailable commands:\n");
- printf(" store save current driver setup for one or each soundcards\n");
- printf(" to configuration file\n");
- printf(" restore load current driver setup for one or each soundcards\n");
- printf(" from configuration file\n");
+ printf(" store save current driver setup for one or each soundcards\n");
+ printf(" to configuration file\n");
+ printf(" restore load current driver setup for one or each soundcards\n");
+ printf(" from configuration file\n");
+ printf(" names dump information about all the known present (sub-)devices\n");
+ printf(" into configuration file (DEPRECATED)\n");
}
int main(int argc, char *argv[])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.14rc4/alsactl/names.c new/alsa-utils-1.0.14/alsactl/names.c
--- old/alsa-utils-1.0.14rc4/alsactl/names.c 2007-05-02 10:04:48.000000000 +0200
+++ new/alsa-utils-1.0.14/alsactl/names.c 2007-05-31 10:07:21.000000000 +0200
@@ -535,7 +535,7 @@
err = snd_output_stdio_open(&out, cfgfile, "w+");
}
if (err < 0) {
- error("Cannot open %s for writing", cfgfile);
+ error("Cannot open %s for writing: %s", cfgfile, snd_strerror(err));
return -errno;
}
err = snd_config_save(config, out);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.14rc4/alsactl/state.c new/alsa-utils-1.0.14/alsactl/state.c
--- old/alsa-utils-1.0.14rc4/alsactl/state.c 2007-05-02 10:04:48.000000000 +0200
+++ new/alsa-utils-1.0.14/alsactl/state.c 2007-05-31 10:07:21.000000000 +0200
@@ -1277,7 +1277,7 @@
else
err = snd_output_stdio_open(&out, file, "w");
if (err < 0) {
- error("Cannot open %s for writing", file);
+ error("Cannot open %s for writing: %s", file, snd_strerror(err));
return -errno;
}
err = snd_config_save(config, out);
@@ -1311,6 +1311,9 @@
error("snd_config_load error: %s", snd_strerror(err));
return err;
}
+ } else {
+ error("Cannot open %s for reading: %s", file, snd_strerror(err));
+ return err;
}
if (!cardname) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.14rc4/alsamixer/alsamixer.c new/alsa-utils-1.0.14/alsamixer/alsamixer.c
--- old/alsa-utils-1.0.14rc4/alsamixer/alsamixer.c 2007-05-02 10:04:48.000000000 +0200
+++ new/alsa-utils-1.0.14/alsamixer/alsamixer.c 2007-05-31 10:07:21.000000000 +0200
@@ -1787,8 +1787,15 @@
}
if ( (mixer_view == VIEW_CAPTURE) || (mixer_view == VIEW_CHANNELS) ) {
- if (snd_mixer_selem_has_capture_volume(elem) ||
- (nelems_added == 0 && snd_mixer_selem_has_capture_switch(elem))) {
+ int do_add = 0;
+ if (snd_mixer_selem_has_capture_volume(elem) &&
+ (mixer_view == VIEW_CAPTURE || !snd_mixer_selem_has_common_volume(elem)))
+ do_add = 1;
+ if (!do_add &&
+ (nelems_added == 0 && snd_mixer_selem_has_capture_switch(elem)) &&
+ (mixer_view == VIEW_CAPTURE || !snd_mixer_selem_has_common_switch(elem)))
+ do_add = 1;
+ if (do_add) {
mixer_grpidx[elem_index] = idx;
mixer_type[elem_index] = MIXER_ELEM_CAPTURE;
if (nelems_added == 0 && snd_mixer_selem_has_capture_switch(elem))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.14rc4/configure new/alsa-utils-1.0.14/configure
--- old/alsa-utils-1.0.14rc4/configure 2007-05-02 10:04:57.000000000 +0200
+++ new/alsa-utils-1.0.14/configure 2007-05-31 10:07:29.000000000 +0200
@@ -2033,7 +2033,7 @@
# Define the identity of the package.
PACKAGE=alsa-utils
- VERSION=1.0.14rc4
+ VERSION=1.0.14
cat >>confdefs.h <<_ACEOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.14rc4/configure.in new/alsa-utils-1.0.14/configure.in
--- old/alsa-utils-1.0.14rc4/configure.in 2007-05-02 10:04:50.000000000 +0200
+++ new/alsa-utils-1.0.14/configure.in 2007-05-31 10:07:23.000000000 +0200
@@ -2,7 +2,7 @@
AC_PREREQ(2.59)
AC_INIT(alsamixer/alsamixer.c)
AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(alsa-utils, 1.0.14rc4)
+AM_INIT_AUTOMAKE(alsa-utils, 1.0.14)
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.15])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.14rc4/include/version.h new/alsa-utils-1.0.14/include/version.h
--- old/alsa-utils-1.0.14rc4/include/version.h 2007-05-02 10:05:03.000000000 +0200
+++ new/alsa-utils-1.0.14/include/version.h 2007-05-31 10:07:35.000000000 +0200
@@ -4,9 +4,9 @@
#define SND_UTIL_MAJOR 1
#define SND_UTIL_MINOR 0
-#define SND_UTIL_SUBMINOR 14rc4
+#define SND_UTIL_SUBMINOR 14
#define SND_UTIL_VERSION ((SND_UTIL_MAJOR<<16)|\
(SND_UTIL_MINOR<<8)|\
SND_UTIL_SUBMINOR)
-#define SND_UTIL_VERSION_STR "1.0.14rc4"
+#define SND_UTIL_VERSION_STR "1.0.14"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.14rc4/po/alsa-utils.pot new/alsa-utils-1.0.14/po/alsa-utils.pot
--- old/alsa-utils-1.0.14rc4/po/alsa-utils.pot 2007-05-02 10:05:12.000000000 +0200
+++ new/alsa-utils-1.0.14/po/alsa-utils.pot 2007-05-31 10:07:44.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-02 10:05+0200\n"
+"POT-Creation-Date: 2007-05-31 10:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Files old/alsa-utils-1.0.14rc4/po/ja.gmo and new/alsa-utils-1.0.14/po/ja.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.14rc4/po/ja.po new/alsa-utils-1.0.14/po/ja.po
--- old/alsa-utils-1.0.14rc4/po/ja.po 2007-05-02 10:05:12.000000000 +0200
+++ new/alsa-utils-1.0.14/po/ja.po 2007-05-31 10:07: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: 2007-05-02 10:05+0200\n"
+"POT-Creation-Date: 2007-05-31 10:07+0200\n"
"PO-Revision-Date: 2006-04-18 15:51+0200\n"
"Last-Translator: Takashi Iwai \n"
"Language-Team: Japanese\n"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org