forked from pool/alsa-utils
This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
974d4566ef
commit
229cc8babd
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ea0ae914cc8d46254dc02ca2b227d379d0eb1d76a3960907e57f26f2ec584aef
|
||||
size 1039779
|
||||
3
alsa-utils-1.0.19.tar.bz2
Normal file
3
alsa-utils-1.0.19.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1f4924f5ae7857ce64a3d6ecbeb98133c74ff1ead2b0f48187623d6e4b838cad
|
||||
size 1040697
|
||||
22
alsa-utils-git-fixes.diff
Normal file
22
alsa-utils-git-fixes.diff
Normal file
@ -0,0 +1,22 @@
|
||||
diff --git a/alsactl/init_parse.c b/alsactl/init_parse.c
|
||||
index 31ed56e..77146d2 100644
|
||||
--- a/alsactl/init_parse.c
|
||||
+++ b/alsactl/init_parse.c
|
||||
@@ -381,7 +381,7 @@ static int set_ctl_value(struct space *space, const char *value, int all)
|
||||
snd_ctl_elem_value_set_integer(space->ctl_value, idx, val);
|
||||
} else if (items > 2 && value[items-2] == 'd' && value[items-1] == 'B') {
|
||||
val = strtol(value, NULL, 0) * 100;
|
||||
- if ((pos2 = index(value, '.')) != NULL) {
|
||||
+ if ((pos2 = strchr(value, '.')) != NULL) {
|
||||
if (isdigit(*(pos2-1)) && isdigit(*(pos2-2))) {
|
||||
if (val < 0)
|
||||
val -= strtol(pos2 + 1, NULL, 0);
|
||||
@@ -1253,7 +1253,7 @@ static char *new_root_dir(const char *filename)
|
||||
|
||||
res = strdup(filename);
|
||||
if (res) {
|
||||
- tmp = rindex(res, '/');
|
||||
+ tmp = strrchr(res, '/');
|
||||
if (tmp)
|
||||
*tmp = '\0';
|
||||
}
|
||||
@ -1,46 +0,0 @@
|
||||
commit 0d6134450ea7db82128138c9ac1bc84e8696dce4
|
||||
Author: Takashi Iwai <tiwai@suse.de>
|
||||
Date: Wed Nov 26 14:27:24 2008 +0100
|
||||
|
||||
speaker-test: Fix floating-point exception bug
|
||||
|
||||
The period_size an buffer_size parameters must be taken after calling
|
||||
snd_pcm_hw_params(). Otherwise they could be undefined numbers.
|
||||
For example, period_size gets 0 when pcsp driver is used, resulting in
|
||||
a floating-point exception error.
|
||||
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
|
||||
diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c
|
||||
index d40342f..75a4bed 100644
|
||||
--- a/speaker-test/speaker-test.c
|
||||
+++ b/speaker-test/speaker-test.c
|
||||
@@ -422,6 +422,14 @@ static int set_hwparams(snd_pcm_t *handle, snd_pcm_hw_params_t *params, snd_pcm_
|
||||
return err;
|
||||
}
|
||||
}
|
||||
+
|
||||
+ /* write the parameters to device */
|
||||
+ err = snd_pcm_hw_params(handle, params);
|
||||
+ if (err < 0) {
|
||||
+ fprintf(stderr, _("Unable to set hw params for playback: %s\n"), snd_strerror(err));
|
||||
+ return err;
|
||||
+ }
|
||||
+
|
||||
snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
|
||||
snd_pcm_hw_params_get_period_size(params, &period_size, NULL);
|
||||
printf(_("was set period_size = %lu\n"),period_size);
|
||||
@@ -431,13 +439,6 @@ static int set_hwparams(snd_pcm_t *handle, snd_pcm_hw_params_t *params, snd_pcm_
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- /* write the parameters to device */
|
||||
- err = snd_pcm_hw_params(handle, params);
|
||||
- if (err < 0) {
|
||||
- fprintf(stderr, _("Unable to set hw params for playback: %s\n"), snd_strerror(err));
|
||||
- return err;
|
||||
- }
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 22 14:00:31 CET 2009 - tiwai@suse.de
|
||||
|
||||
- updated to version 1.0.19
|
||||
- use ANSI-C functions instead of index()
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 26 14:31:40 CET 2008 - tiwai@suse.de
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package alsa-utils (Version 1.0.18)
|
||||
# spec file for package alsa-utils (Version 1.0.19)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -20,19 +20,17 @@
|
||||
|
||||
Name: alsa-utils
|
||||
BuildRequires: alsa-devel ncurses-devel xmlto
|
||||
%define package_version 1.0.18
|
||||
%define package_version 1.0.19
|
||||
License: GPL v2 or later
|
||||
Group: Productivity/Multimedia/Sound/Players
|
||||
Provides: alsa-conf
|
||||
Requires: dialog pciutils
|
||||
AutoReqProv: on
|
||||
Summary: Advanced Linux Sound Architecture Utilities
|
||||
Version: 1.0.18
|
||||
Release: 6
|
||||
Version: 1.0.19
|
||||
Release: 1
|
||||
Source: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2
|
||||
# Patch: alsa-utils-git-fixes.diff
|
||||
# Patch1: alsa-utils-%{package_version}-package-fix.diff
|
||||
Patch2: alsa-utils-speaker-test-parameter-get-fix.diff
|
||||
Patch: alsa-utils-git-fixes.diff
|
||||
Url: http://www.alsa-project.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -49,9 +47,7 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{package_version}
|
||||
# %patch1 -p1
|
||||
# %patch -p1
|
||||
%patch2 -p1
|
||||
%patch -p1
|
||||
mv alsamixer/README alsamixer/README-alsamixer
|
||||
|
||||
%build
|
||||
@ -60,7 +56,7 @@ autoreconf -fi
|
||||
make %{?jobs:-j %jobs}
|
||||
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
%makeinstall
|
||||
%find_lang %{name} --all-name
|
||||
|
||||
%clean
|
||||
@ -80,6 +76,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
|
||||
%{_datadir}/alsa
|
||||
|
||||
%changelog
|
||||
* Thu Jan 22 2009 tiwai@suse.de
|
||||
- updated to version 1.0.19
|
||||
- use ANSI-C functions instead of index()
|
||||
* Wed Nov 26 2008 tiwai@suse.de
|
||||
- fix division-by-zero error in speaker-test program
|
||||
* Wed Oct 29 2008 tiwai@suse.de
|
||||
|
||||
Loading…
Reference in New Issue
Block a user