Takashi Iwai
f84c139643
- Backport upstream fixes: a few fixes for chmap support, alsaconf updates, a new monitor command for alsactl, etc: 0006-amixer-fix-indentation-when-printing-container-TLV-c.patch 0007-alsaloop-pcmjob.c-use-portable-way-to-initialize-rec.patch 0008-speaker-test-Fix-chmapped-channel-selection-without-.patch 0009-speaker-test-Always-show-chmap-channel-names-if-avai.patch 0010-speaker-test-Show-out-of-chmap-channels-as-Unknown.patch 0011-alsaconf-support-newer-m-i-t-and-kmod.patch 0012-alsaconf-update-gentoo-to-use-modprobe.d-method-as-e.patch 0013-configure-detect-udevdir-via-pkg-config-fallback-to-.patch 0014-alsactl-Add-monitor-command.patch 0015-alsactl-Fix-REMOVE-event-handling-in-monitor-command.patch 0016-alsactl-monitor-all-cards-as-default.patch OBS-URL: https://build.opensuse.org/request/show/208681 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=94
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From df875c6e8f1a26ccba8a9d864bcff85b633df244 Mon Sep 17 00:00:00 2001
|
|
From: Mike Frysinger <vapier@gentoo.org>
|
|
Date: Wed, 13 Nov 2013 13:23:47 -0500
|
|
Subject: [PATCH] alsaconf: support newer m-i-t and kmod
|
|
|
|
The m-i-t package made it up to 3.10 versions before ending, so update
|
|
the glob to handle those too.
|
|
|
|
Most distros are moving on to kmod, so we also want to handle the version
|
|
string that package outputs.
|
|
|
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
alsaconf/alsaconf.in | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
|
|
index 5c23787742f1..59f25d1ee1d9 100644
|
|
--- a/alsaconf/alsaconf.in
|
|
+++ b/alsaconf/alsaconf.in
|
|
@@ -308,9 +308,11 @@ elif [ "$kernel" = "new" ]; then
|
|
cfgout="/etc/modprobe.d/50-sound.conf"
|
|
cfgoldout="/etc/modprobe.d/sound"
|
|
if [ ! -f $cfgout ]; then
|
|
- modver=$(modprobe -V | sed -e's/^module-init-tools version //')
|
|
- case "$modver" in
|
|
- 3.[789]*)
|
|
+ case "$(modprobe -V)" in
|
|
+ "module-init-tools version "3.[789]*|\
|
|
+ "module-init-tools version "3.1[0-9]*)
|
|
+ ;;
|
|
+ "kmod version "*)
|
|
;;
|
|
*)
|
|
cfgout="/etc/modprobe.d/sound"
|
|
--
|
|
1.8.4.3
|
|
|