[software/drakx] 01/02: draksound: adapt to the switch to systemd for spawning PulseAudio

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

colin pushed a commit to branch master
in repository software/drakx.

commit 9abbdcb76ab1340dd1a1eaaaeb49bdf603b8a703
Author: Colin Guthrie <colin-odJJhXpcy38dnm+***@public.gmane.org>
Date: Sat Oct 18 22:21:57 2014 +0200

draksound: adapt to the switch to systemd for spawning PulseAudio
---
Commit Link:
http://gitweb.mageia.org/software/drakx/commit/?id=9abbdcb76ab1340dd1a1eaaaeb49bdf603b8a703

perl-install/NEWS | 3 +++
perl-install/harddrake/sound.pm | 21 +--------------------
2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 65eaf37..9dfa767 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- draksound
+ o adapt to the switch to systemd for spawning PulseAudio
+
Version 16.37 - 3 July 2014

- diskdrake:
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 2ca4b8e..520402c 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -61,24 +61,6 @@ sub set_pulseaudio_glitchfree {
} $pa_startup_scriptfile;
}

-my $pa_client_conffile = "$::prefix/etc/pulse/client.conf";
-
-sub set_PA_autospan {
- my ($val) = @_;
-
- return if ! -f $pa_client_conffile;
-
- $val = 'autospawn = ' . bool2yesno($val) . "\n";
- my $done;
- substInFile {
- if (/^autospawn\s*=/) {
- $_ = $val;
- $done = 1;
- }
- } $pa_client_conffile;
- append_to_file($pa_client_conffile, $val) if !$done;
-}
-

sub rooted { run_program::rooted($::prefix, @_) }

@@ -129,7 +111,7 @@ sub config {
push @alternative, $driver;
my %des = modules::category2modules_and_description('multimedia/sound');

- my $is_pulseaudio_installed = (-f $pa_startup_scriptfile && -f $pa_client_conffile && -d '/etc/sound/profiles/pulse');
+ my $is_pulseaudio_installed = (-f $pa_startup_scriptfile && -d '/etc/sound/profiles/pulse');
my $is_pulseaudio_enabled = is_pulseaudio_enabled();
my $is_pulseaudio_glitchfree_enabled = is_pulseaudio_glitchfree_enabled();

@@ -139,7 +121,6 @@ sub config {
return if !$is_pulseaudio_installed;
set_pulseaudio($is_pulseaudio_enabled);
set_pulseaudio_glitchfree($is_pulseaudio_glitchfree_enabled);
- set_PA_autospan($is_pulseaudio_enabled);
if ($is_pulseaudio_enabled) {
my $lib = (arch() =~ /x86_64/ ? 'lib64' : 'lib');
$in->do_pkgs->ensure_is_installed($lib . 'alsa-plugins-pulseaudio',

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

colin pushed a commit to branch master
in repository software/drakx.

commit cc63616b695b12e282940655ae6595dbc7de0247
Author: Colin Guthrie <colin-odJJhXpcy38dnm+***@public.gmane.org>
Date: Sat Oct 18 22:35:16 2014 +0200

draksound: Kill off some old, no longer present services.

We should probably rip out a lot more here (i.e. we should really not
need to do any sound slot config these days in modprobe.conf)
---
Commit Link:
http://gitweb.mageia.org/software/drakx/commit/?id=cc63616b695b12e282940655ae6595dbc7de0247

perl-install/harddrake/sound.pm | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 520402c..e7acf25 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -77,9 +77,7 @@ sub do_switch {
my $_wait = $in->wait_message(N("Please wait"), N("Please Wait... Applying the configuration"));
log::explanations("removing old $old_driver\n");
if ($::isStandalone) {
- rooted("service sound stop");
- rooted("service alsa stop") if $old_driver =~ /^snd_/;
- unload($old_driver); # run_program("/sbin/modprobe -r $driver"); # just in case ...
+ unload($old_driver); # run_program("/sbin/modprobe -r $driver");
}
$modules_conf->remove_module($old_driver);
configure_one_sound_slot($modules_conf, $index, $new_driver);
@@ -87,13 +85,8 @@ sub do_switch {
if ($new_driver =~ /^snd_/) { # new driver is an alsa one
$in->do_pkgs->ensure_binary_is_installed(qw(alsa-utils alsactl), 1);
$in->do_pkgs->ensure_binary_is_installed(qw(aoss aoss), 1);
- rooted("service alsa start") if $::isStandalone;
- rooted("/sbin/chkconfig --add alsa") if $::isStandalone;
- load($modules_conf, $new_driver) if $::isStandalone; # service alsa is buggy
- } else { rooted("/sbin/chkconfig --del alsa") }
- log::explanations("loading new $new_driver\n");
- rooted("/sbin/chkconfig --add sound"); # just in case ...
- rooted("service sound start") if $::isStandalone;
+ load($modules_conf, $new_driver) if $::isStandalone;
+ }
}

sub config {