Re: [devel-distro] feature use/sound/alsa

[Michael Shigorin <mike@altlinux.org>]

[-- Attachment #1: Type: text/plain, Size: 384 bytes --]

On Sat, Jan 06, 2018 at 04:22:27PM +0700, Антон Мидюков wrote:
> 2. Предлагаю добавить эту фичу всем десктопным дистрибутивам
> без pulseaudio. Ну, а регуляркам на Cinnamon и gnome3 добавить
> фичу +pulse. 

Второй патч бы адаптировать поверх и с учётом принятых
(прилагаются).

-- 
 ---- WBR, Michael Shigorin / http://altlinux.org
  ------ http://opennet.ru / http://anna-news.info

[-- Attachment #2: 0001-sound-added-udev-alsa-in-feature-use-sound-alsa-alsa.patch --]
[-- Type: text/x-patch, Size: 846 bytes --]

>From c13ec2d67b7388ef11586f4ed141c7d19b057425 Mon Sep 17 00:00:00 2001
From: Anton Midyukov <antohami@altlinux.org>
Date: Sat, 6 Jan 2018 16:06:55 +0700
Subject: [PATCH 1/3] sound: added udev-alsa in feature use/sound/alsa (+alsa)

This one should care for default mixer levels upon boot.
---
 features.in/sound/config.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/features.in/sound/config.mk b/features.in/sound/config.mk
index 02b603e..5761963 100644
--- a/features.in/sound/config.mk
+++ b/features.in/sound/config.mk
@@ -10,6 +10,7 @@ use/sound:
 # ALSA only sound (additional utils needed if using pulseaudio)
 use/sound/alsa: use/sound
 	@$(call add,THE_PACKAGES,apulse)
+	@$(call add,THE_PACKAGES,udev-alsa)
 
 # PulseAudio (useful for per-app levels, dynamic devices and networked sound)
 use/sound/pulse: use/sound
-- 
2.10.4


[-- Attachment #3: 0002-sound-added-a-switch-between-alsa-and-pulseaudio.patch --]
[-- Type: text/x-patch, Size: 1581 bytes --]

>From 530d4c1740aa2a5cd03d07c9aa3370a592483068 Mon Sep 17 00:00:00 2001
From: Anton Midyukov <antohami@altlinux.org>
Date: Wed, 10 Jan 2018 22:37:34 +0700
Subject: [PATCH 2/3] sound: added a switch between alsa and pulseaudio

Those images who are fine with ALSA might still benefit
from addons like udev-alsa to have mixer levels restored
on boot; and PulseAudio-bearing images can be based upon
the same intermediate targets now without receiving the
addons they don't need.
---
 features.in/sound/config.mk | 6 +++---
 pkg.in/lists/sound/alsa     | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 pkg.in/lists/sound/alsa

diff --git a/features.in/sound/config.mk b/features.in/sound/config.mk
index 5761963..96f191c 100644
--- a/features.in/sound/config.mk
+++ b/features.in/sound/config.mk
@@ -6,12 +6,12 @@ use/sound:
 	@$(call add_feature)
 	@$(call add,THE_KMODULES,alsa sound)
 	@$(call add,THE_LISTS,sound/base)
+	@$(call add,THE_LISTS,$$(THE_SOUND))
 
 # ALSA only sound (additional utils needed if using pulseaudio)
 use/sound/alsa: use/sound
-	@$(call add,THE_PACKAGES,apulse)
-	@$(call add,THE_PACKAGES,udev-alsa)
+	@$(call set,THE_SOUND,sound/alsa)
 
 # PulseAudio (useful for per-app levels, dynamic devices and networked sound)
 use/sound/pulse: use/sound
-	@$(call add,THE_LISTS,sound/pulseaudio)
+	@$(call set,THE_SOUND,sound/pulseaudio)
diff --git a/pkg.in/lists/sound/alsa b/pkg.in/lists/sound/alsa
new file mode 100644
index 0000000..dc3226f
--- /dev/null
+++ b/pkg.in/lists/sound/alsa
@@ -0,0 +1,2 @@
+apulse
+udev-alsa
-- 
2.10.4


[-- Attachment #4: 0003-mixin.mk-replace-use-sound-with-alsa-for-desktop-reg.patch --]
[-- Type: text/x-patch, Size: 1171 bytes --]

>From 2a2b3e1b7bc9314b94369ac43583b814c108474c Mon Sep 17 00:00:00 2001
From: Anton Midyukov <antohami@altlinux.org>
Date: Sat, 13 Jan 2018 13:09:53 +0700
Subject: [PATCH 3/3] mixin.mk: replace use/sound with +alsa for
 desktop/regular

This will solve the sound problems when using regulars:
- The sound when the computer is restarted is set to 0
- Some applications do not know how to work directly with ALSA,
  apulse allows you to solve this problem partially.

Using feature +pulse will override use of +alsa feature.
---
 conf.d/mixin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk
index 9793b67..28ce4c8 100644
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -19,7 +19,7 @@ mixin/e2k-desktop: use/e2k/x11 use/e2k/sound use/l10n/default/ru_RU \
 
 ### regular.mk
 # common WM live/installer bits
-mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
+mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs
 	@$(call add,THE_PACKAGES,pam-limits-desktop)
 	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
 	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
-- 
2.10.4