Accepting request 183762 from multimedia:libs
- remove superfluous ca0106 file (now included in 1.0.27.2) - 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 OBS-URL: https://build.opensuse.org/request/show/183762 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa-utils?expand=0&rev=81
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
e2d7188c62
@ -1,30 +0,0 @@
|
||||
From 2f2576518c8336f5d64f1111f2a1a0abeda54a1f Mon Sep 17 00:00:00 2001
|
||||
From: Jordi Mallach <jordi@debian.org>
|
||||
Date: Fri, 17 May 2013 14:30:46 +0200
|
||||
Subject: [PATCH] Require alsa-lib 1.0.27.
|
||||
|
||||
Both aplay and speaker-test use the new snd_pcm_abort() function, which was
|
||||
introduced in alsa-lib 1.0.27.
|
||||
|
||||
Signed-off-by: Jordi Mallach <jordi@debian.org>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
configure.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 39f2d0d..0e43327 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -32,7 +32,7 @@ AC_PROG_MKDIR_P
|
||||
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])])
|
||||
--
|
||||
1.8.2.3
|
||||
|
||||
23
0001-alsactl-alsa-state.service-fix-typo-rkill-kill.patch
Normal file
23
0001-alsactl-alsa-state.service-fix-typo-rkill-kill.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From dda4392cd5e87270db044e2838b17e2edc034dc3 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@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 <perex@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
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 121df3694970d7eded56432c9baa24b8ccd122b1 Mon Sep 17 00:00:00 2001
|
||||
From: "Gabriel M. Beddingfield" <gabrbedd@gmail.com>
|
||||
Date: Sun, 26 May 2013 15:54:44 -0700
|
||||
Subject: [PATCH] alsactl init: ca0106 file was omitted
|
||||
|
||||
The file alsactl/init/00main includes the line:
|
||||
|
||||
CARDINFO{driver}=="CA0106", INCLUDE="ca0106", GOTO="init_end"
|
||||
|
||||
However, the file alsactl/init/ca0106 is not making it into the
|
||||
release tarballs (nor to user installations).
|
||||
|
||||
This patch adds the ca0106 file to the build.
|
||||
|
||||
Signed-off-by: Gabriel M. Beddingfield <gabrbedd@gmail.com>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
alsactl/init/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/alsactl/init/Makefile.am b/alsactl/init/Makefile.am
|
||||
index 9e2b83d..64dac41 100644
|
||||
--- a/alsactl/init/Makefile.am
|
||||
+++ b/alsactl/init/Makefile.am
|
||||
@@ -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)
|
||||
--
|
||||
1.8.2.3
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From c0f70a0b8e340d6ee903ff226886bb6f969d46a1 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Mon, 27 May 2013 09:26:39 +0200
|
||||
Subject: [PATCH] alsactl: return back the udevrules_DATA rule for
|
||||
90-alsa-restore.rules
|
||||
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
alsactl/Makefile.am | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
|
||||
index c0df981..bac84eb 100644
|
||||
--- a/alsactl/Makefile.am
|
||||
+++ b/alsactl/Makefile.am
|
||||
@@ -11,6 +11,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
|
||||
+
|
||||
if HAVE_SYSTEMD
|
||||
|
||||
systemdsystemunit_DATA = \
|
||||
--
|
||||
1.8.2.3
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From d61924fd247c2cf0280391e076c439c9427732aa Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Mon, 27 May 2013 16:40:26 +0200
|
||||
Subject: [PATCH] amixer: Fix the hctl elem search bug
|
||||
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
amixer/amixer.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/amixer/amixer.c b/amixer/amixer.c
|
||||
index 2f1521b..92b0f83 100644
|
||||
--- a/amixer/amixer.c
|
||||
+++ b/amixer/amixer.c
|
||||
@@ -1105,6 +1105,7 @@ static int cset(int argc, char *argv[], int roflag, int keep_handle)
|
||||
}
|
||||
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) {
|
||||
--
|
||||
1.8.2.3
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From c80a38dbf53531d57c9bd4ccdc05553bd7fb79a1 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Tue, 28 May 2013 08:43:30 +0200
|
||||
Subject: [PATCH] amixer: fix print_dB for -0.99 .. -0.01 range
|
||||
|
||||
The first number is 0 when input dB (hundreds) is in range -99 .. -1 .
|
||||
The printed number was positive in this case. This patch fixes this issue.
|
||||
|
||||
Reported-by: Tom Becker <GTBecker@RighTime.com>
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
amixer/amixer.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/amixer/amixer.c b/amixer/amixer.c
|
||||
index 92b0f83..fe83b49 100644
|
||||
--- a/amixer/amixer.c
|
||||
+++ b/amixer/amixer.c
|
||||
@@ -431,7 +431,11 @@ static void print_spaces(unsigned int spaces)
|
||||
|
||||
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)
|
||||
--
|
||||
1.8.2.3
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
From 9fe90a020ccd2662120b498e9a5cdd4ea1b959ba Mon Sep 17 00:00:00 2001
|
||||
From: David Henningsson <david.henningsson@canonical.com>
|
||||
Date: Fri, 14 Jun 2013 11:41:01 +0200
|
||||
Subject: [PATCH] amixer: Print TLV of channel map controls
|
||||
|
||||
Previously these were written as "unk-25..." which wasn't very user friendly.
|
||||
|
||||
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
amixer/amixer.c | 22 ++++++++++++++++++++++
|
||||
1 file changed, 22 insertions(+)
|
||||
|
||||
diff --git a/amixer/amixer.c b/amixer/amixer.c
|
||||
index fe83b49..7727943 100644
|
||||
--- a/amixer/amixer.c
|
||||
+++ b/amixer/amixer.c
|
||||
@@ -443,6 +443,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
|
||||
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");
|
||||
@@ -541,6 +542,27 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
|
||||
}
|
||||
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) {
|
||||
--
|
||||
1.8.3
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
From 7ac9508c4e20097290b322c661f550e7c24bfa44 Mon Sep 17 00:00:00 2001
|
||||
From: David Henningsson <david.henningsson@canonical.com>
|
||||
Date: Mon, 10 Jun 2013 16:42:48 +0200
|
||||
Subject: [PATCH] speaker-test: Fix wrong wave file played back in chmap setup
|
||||
|
||||
When explicitly specifying channel maps, we need to use that when
|
||||
loading wave files so the correct file is played back.
|
||||
|
||||
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
speaker-test/speaker-test.c | 14 +++++++++++---
|
||||
1 file changed, 11 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c
|
||||
index a41b5bd..d35065f 100644
|
||||
--- a/speaker-test/speaker-test.c
|
||||
+++ b/speaker-test/speaker-test.c
|
||||
@@ -771,8 +771,16 @@ static int setup_wav_file(int chn)
|
||||
|
||||
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 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
--
|
||||
1.8.3
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3de65a2fae0ce679027be24cf477935d901038fa8bf7056130ea368e449a9350
|
||||
size 1142802
|
||||
3
alsa-utils-1.0.27.2.tar.bz2
Normal file
3
alsa-utils-1.0.27.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea
|
||||
size 1143802
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 19 15:23:41 CEST 2013 - tiwai@suse.de
|
||||
|
||||
- remove superfluous ca0106 file (now included in 1.0.27.2)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 19 15:13:27 CEST 2013 - tiwai@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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 10:14:18 CEST 2013 - tiwai@suse.de
|
||||
|
||||
|
||||
@ -44,7 +44,7 @@ BuildRequires: libudev-devel
|
||||
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 @@ Requires: pciutils
|
||||
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 @@ sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am
|
||||
# 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
|
||||
|
||||
31
ca0106
31
ca0106
@ -1,31 +0,0 @@
|
||||
# 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"
|
||||
Loading…
Reference in New Issue
Block a user