OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa-utils?expand=0&rev=4

alsa-utils-1.0.14.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb
+size 1013872

alsa-utils-1.0.14rc4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a80a74c9ea0f40c5c0d3f5e6c49c90aea75ab0a7666386635ed7ca731731135
-size 1013801

alsa-utils-hg-fixes.diff

@@ -1,86 +0,0 @@
-diff -r dee0ae0aef39 alsactl/alsactl.c
---- a/alsactl/alsactl.c	Wed May 02 08:45:47 2007 +0200
-+++ b/alsactl/alsactl.c	Thu May 24 12:49:32 2007 +0200
-@@ -41,16 +41,18 @@ static void help(void)
- {
- 	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 <card #>  save current driver setup for one or each soundcards\n");
--	printf("                  to configuration file\n");
--	printf("  restore<card #> load current driver setup for one or each soundcards\n");
--	printf("                  from configuration file\n");
-+	printf("  store   <card #> save current driver setup for one or each soundcards\n");
-+	printf("                   to configuration file\n");
-+	printf("  restore <card #> load current driver setup for one or each soundcards\n");
-+	printf("                   from configuration file\n");
-+	printf("  names   <card #> dump information about all the known present (sub-)devices\n");
-+	printf("                   into configuration file (DEPRECATED)\n");
- }
- 
- int main(int argc, char *argv[])
-diff -r dee0ae0aef39 alsactl/names.c
---- a/alsactl/names.c	Wed May 02 08:45:47 2007 +0200
-+++ b/alsactl/names.c	Thu May 24 12:49:32 2007 +0200
-@@ -535,7 +535,7 @@ int generate_names(const char *cfgfile)
- 			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 -r dee0ae0aef39 alsactl/state.c
---- a/alsactl/state.c	Wed May 02 08:45:47 2007 +0200
-+++ b/alsactl/state.c	Thu May 24 12:49:32 2007 +0200
-@@ -1277,7 +1277,7 @@ int save_state(const char *file, const c
- 	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 @@ int load_state(const char *file, const c
- 			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 -r dee0ae0aef39 alsamixer/alsamixer.c
---- a/alsamixer/alsamixer.c	Wed May 02 08:45:47 2007 +0200
-+++ b/alsamixer/alsamixer.c	Thu May 24 12:49:32 2007 +0200
-@@ -1787,8 +1787,15 @@ __again:
-     }
- 
-     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))

alsa-utils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 31 12:26:10 CEST 2007 - tiwai@suse.de
+
+- updated to version 1.0.14-final
+  including previous HG fixes
+
 -------------------------------------------------------------------
 Thu May 24 12:57:23 CEST 2007 - tiwai@suse.de
 

alsa-utils.spec

@@ -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
+Version:        1.0.14
-Release:        10
+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 @@ Authors:
     Takashi Iwai <tiwai@suse.de>
 
 %prep
-%setup -n %{name}-%{package_version}
+%setup -q -n %{name}-%{package_version}
-%patch -p1
+# %patch -p1
 mv alsamixer/README alsamixer/README-alsamixer
 %{?suse_update_config:%{suse_update_config -f .}}
 
@@ -69,6 +69,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %{_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