This commit is contained in:
parent
275274ebea
commit
5f4d620716
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:de64de37a9acf918f347a3975e0ad3f58b24790dafdd03d9869a22ced4e5dcc7
|
||||
size 785668
|
3
alsa-lib-1.0.15.tar.bz2
Normal file
3
alsa-lib-1.0.15.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f24272f3a32262c5285fc5bae0b9aa65494e8b22ac536313dbb60b8e4231e952
|
||||
size 793909
|
@ -1,34 +0,0 @@
|
||||
tree 923dc1303d0a
|
||||
parent 5e72b6913eb3
|
||||
author tiwai 1190034232 -7200
|
||||
committer tiwai 1190034232 -7200
|
||||
revision 2329
|
||||
|
||||
Fix subdevice number to 0 for dmix/dsnoop
|
||||
|
||||
The dmix and dsnoop plugins need a fixed substream number instead of
|
||||
the next-available one (-1) as the default number. Now it's set to 0.
|
||||
diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
|
||||
--- a/src/conf/pcm/dmix.conf
|
||||
+++ b/src/conf/pcm/dmix.conf
|
||||
@@ -20,7 +20,7 @@ pcm.!dmix {
|
||||
}
|
||||
@args.SUBDEV {
|
||||
type integer
|
||||
- default -1
|
||||
+ default 0
|
||||
}
|
||||
@args.FORMAT {
|
||||
type string
|
||||
diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf
|
||||
--- a/src/conf/pcm/dsnoop.conf
|
||||
+++ b/src/conf/pcm/dsnoop.conf
|
||||
@@ -20,7 +20,7 @@ pcm.!dsnoop {
|
||||
}
|
||||
@args.SUBDEV {
|
||||
type integer
|
||||
- default -1
|
||||
+ default 0
|
||||
}
|
||||
@args.FORMAT {
|
||||
type string
|
@ -1,77 +0,0 @@
|
||||
tree fc6b0b3b0c20
|
||||
parent 652611f58008
|
||||
author tiwai 1188391711 -7200
|
||||
committer tiwai 1188391711 -7200
|
||||
revision 2318
|
||||
|
||||
Handle "Input Source" as a capture element
|
||||
|
||||
Some drivers use "Input Source" as the capture source mixer element because
|
||||
mixer abstraction layer can't handle multiple "Capture Source" elements.
|
||||
This patch adds a hack to handle Input Source as a capture route, and let
|
||||
mixer apps know that it's a capture stuff, at least.
|
||||
diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
|
||||
--- a/src/mixer/simple_none.c
|
||||
+++ b/src/mixer/simple_none.c
|
||||
@@ -918,6 +918,19 @@ static int base_len(const char *name, se
|
||||
}
|
||||
p++;
|
||||
}
|
||||
+
|
||||
+ /* Special case - handle "Input Source" as a capture route.
|
||||
+ * Note that it's *NO* capture source. A capture source is split over
|
||||
+ * sub-elements, and multiple capture-sources will result in an error.
|
||||
+ * That's why some drivers use "Input Source" as a workaround.
|
||||
+ * Hence, this is a workaround for a workaround to get the things
|
||||
+ * straight back again. Sigh.
|
||||
+ */
|
||||
+ if (!strcmp(name, "Input Source")) {
|
||||
+ *type = CTL_CAPTURE_ROUTE;
|
||||
+ return strlen(name);
|
||||
+ }
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1629,7 +1642,12 @@ static int simple_add1(snd_mixer_class_t
|
||||
{
|
||||
unsigned int n;
|
||||
if (ctype == SND_CTL_ELEM_TYPE_ENUMERATED) {
|
||||
- type = CTL_GLOBAL_ENUM;
|
||||
+ if (type == CTL_PLAYBACK_ROUTE)
|
||||
+ type = CTL_PLAYBACK_ENUM;
|
||||
+ else if (type == CTL_CAPTURE_ROUTE)
|
||||
+ type = CTL_CAPTURE_ENUM;
|
||||
+ else
|
||||
+ type = CTL_GLOBAL_ENUM;
|
||||
break;
|
||||
}
|
||||
if (ctype != SND_CTL_ELEM_TYPE_BOOLEAN)
|
||||
@@ -1644,7 +1662,12 @@ static int simple_add1(snd_mixer_class_t
|
||||
case CTL_PLAYBACK_SWITCH:
|
||||
case CTL_CAPTURE_SWITCH:
|
||||
if (ctype == SND_CTL_ELEM_TYPE_ENUMERATED) {
|
||||
- type = CTL_GLOBAL_ENUM;
|
||||
+ if (type == CTL_PLAYBACK_SWITCH)
|
||||
+ type = CTL_PLAYBACK_ENUM;
|
||||
+ else if (type == CTL_CAPTURE_SWITCH)
|
||||
+ type = CTL_CAPTURE_ENUM;
|
||||
+ else
|
||||
+ type = CTL_GLOBAL_ENUM;
|
||||
break;
|
||||
}
|
||||
if (ctype != SND_CTL_ELEM_TYPE_BOOLEAN)
|
||||
@@ -1654,7 +1677,12 @@ static int simple_add1(snd_mixer_class_t
|
||||
case CTL_PLAYBACK_VOLUME:
|
||||
case CTL_CAPTURE_VOLUME:
|
||||
if (ctype == SND_CTL_ELEM_TYPE_ENUMERATED) {
|
||||
- type = CTL_GLOBAL_ENUM;
|
||||
+ if (type == CTL_PLAYBACK_VOLUME)
|
||||
+ type = CTL_PLAYBACK_ENUM;
|
||||
+ else if (type == CTL_CAPTURE_VOLUME)
|
||||
+ type = CTL_CAPTURE_ENUM;
|
||||
+ else
|
||||
+ type = CTL_GLOBAL_ENUM;
|
||||
break;
|
||||
}
|
||||
if (ctype != SND_CTL_ELEM_TYPE_INTEGER)
|
@ -1,23 +0,0 @@
|
||||
tree 65d47cdd771c
|
||||
parent 7bb5b9fa6c6c
|
||||
author tiwai 1187180553 -7200
|
||||
committer tiwai 1187180553 -7200
|
||||
revision 2312
|
||||
|
||||
Fix use after free
|
||||
|
||||
Fixed use after free (ALSA bug#3300).
|
||||
diff --git a/src/confmisc.c b/src/confmisc.c
|
||||
--- a/src/confmisc.c
|
||||
+++ b/src/confmisc.c
|
||||
@@ -764,9 +764,9 @@ static int parse_card(snd_config_t *root
|
||||
return err;
|
||||
}
|
||||
card = snd_card_get_index(str);
|
||||
- free(str);
|
||||
if (card < 0)
|
||||
SNDERR("cannot find card '%s'", str);
|
||||
+ free(str);
|
||||
return card;
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 16 15:01:53 CEST 2007 - tiwai@suse.de
|
||||
|
||||
- updated to version 1.0.15-final
|
||||
* including all previous patches
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 17 16:04:20 CEST 2007 - tiwai@suse.de
|
||||
|
||||
|
36
alsa.spec
36
alsa.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package alsa (Version 1.0.14)
|
||||
# spec file for package alsa (Version 1.0.15)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
Name: alsa
|
||||
BuildRequires: doxygen
|
||||
%define package_version 1.0.14a
|
||||
%define package_version 1.0.15
|
||||
License: GPL v2 or later
|
||||
Group: System/Libraries
|
||||
Requires: alsa-utils
|
||||
@ -20,8 +20,8 @@ Recommends: alsa-plugins alsa-oss
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
AutoReqProv: on
|
||||
Summary: Advanced Linux Sound Architecture
|
||||
Version: 1.0.14
|
||||
Release: 29
|
||||
Version: 1.0.15
|
||||
Release: 1
|
||||
Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
|
||||
Source8: 40-alsa.rules
|
||||
Source11: alsasound
|
||||
@ -35,10 +35,7 @@ Source21: README.testwav
|
||||
Source30: all_notes_off
|
||||
Source31: all_notes_off.bin
|
||||
Source32: all_notes_off.mid
|
||||
Patch: alsa-lib-hg-fixes.diff
|
||||
Patch1: alsa-lib-fix-use-after-free.diff
|
||||
Patch2: alsa-lib-fix-input-source-as-capture.diff
|
||||
Patch3: alsa-lib-fix-dmix-subdevice.diff
|
||||
# Patch: alsa-lib-hg-fixes.diff
|
||||
Url: http://www.alsa-project.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -53,7 +50,7 @@ on your Linux box. To set it up, run yast2 or alsaconf.
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Jaroslav Kysela <perex@suse.de>
|
||||
Jaroslav Kysela <perex@perex.cz>
|
||||
Takashi Iwai <tiwai@suse.de>
|
||||
|
||||
%package devel
|
||||
@ -72,10 +69,8 @@ to develop applications that require these.
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Jaroslav Kysela <perex@suse.de>
|
||||
Jaroslav Kysela <perex@perex.cz>
|
||||
Takashi Iwai <tiwai@suse.de>
|
||||
Abramo Bagnara <abramo@alsa-project.org>
|
||||
Frank van de Pol <fvdpol@coil.demon.nl>
|
||||
|
||||
%package docs
|
||||
Summary: Additional Package Documentation
|
||||
@ -90,10 +85,8 @@ this package's base documentation.
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Jaroslav Kysela <perex@suse.de>
|
||||
Jaroslav Kysela <perex@perex.cz>
|
||||
Takashi Iwai <tiwai@suse.de>
|
||||
Abramo Bagnara <abramo@alsa-project.org>
|
||||
Frank van de Pol <fvdpol@coil.demon.nl>
|
||||
|
||||
%package -n libasound2
|
||||
Summary: Advanced Linux Sound Architecture Library
|
||||
@ -109,17 +102,12 @@ Architecture.
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Jaroslav Kysela <perex@suse.de>
|
||||
Jaroslav Kysela <perex@perex.cz>
|
||||
Takashi Iwai <tiwai@suse.de>
|
||||
Abramo Bagnara <abramo@alsa-project.org>
|
||||
Frank van de Pol <fvdpol@coil.demon.nl>
|
||||
|
||||
%prep
|
||||
%setup -q -n alsa-lib-%{package_version}
|
||||
%patch -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
# %patch -p1
|
||||
%{?suse_update_config:%{suse_update_config -f .}}
|
||||
|
||||
%build
|
||||
@ -259,8 +247,10 @@ exit 0
|
||||
%{_libdir}/libasound.so.*
|
||||
%{_libdir}/alsa-lib
|
||||
%{_datadir}/alsa
|
||||
|
||||
%changelog
|
||||
* Tue Oct 16 2007 - tiwai@suse.de
|
||||
- updated to version 1.0.15-final
|
||||
* including all previous patches
|
||||
* Mon Sep 17 2007 - tiwai@suse.de
|
||||
- fix the wrong subdevice number for dmix/dsnoop plugins (#325676)
|
||||
- fix the handling of "Input Source", to be as a capture element
|
||||
|
@ -31,6 +31,8 @@ set PCM 90% unmute
|
||||
set PCM 0dB
|
||||
set Synth 90% unmute
|
||||
set Synth 0dB
|
||||
set Speaker 90% unmute
|
||||
set Speaker -12dB
|
||||
set CD 90% unmute
|
||||
set CD 0dB
|
||||
# mute mic
|
||||
|
Loading…
Reference in New Issue
Block a user