[packages/alsa-utils] - updated to 1.1.4 - removed obsolete missing patch - if not using udev, run alsactl restore in init
qboosh
qboosh at pld-linux.org
Sat May 20 21:01:35 CEST 2017
commit 08fa9b0b1f5a8e793a3ed5f8060e3dab1c8e4dfc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat May 20 21:02:24 2017 +0200
- updated to 1.1.4
- removed obsolete missing patch
- if not using udev, run alsactl restore in init script start action
alsa-utils-missing.patch | 238 -----------------------------------------------
alsa-utils.spec | 6 +-
alsasound.init | 5 +
3 files changed, 7 insertions(+), 242 deletions(-)
---
diff --git a/alsa-utils.spec b/alsa-utils.spec
index 5dea47e..31d21e0 100644
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -5,20 +5,19 @@ Summary(pt_BR.UTF-8): Utilitários para o ALSA (Advanced Linux Sound Architectur
Summary(ru.UTF-8): Утилиты командной строки для ALSA project
Summary(uk.UTF-8): Утиліти командного рядка для ALSA project
Name: alsa-utils
-Version: 1.1.3
+Version: 1.1.4
Release: 1
# some apps GPL v2, some GPL v2+
License: GPL v2
Group: Applications/Sound
Source0: ftp://ftp.alsa-project.org/pub/utils/%{name}-%{version}.tar.bz2
-# Source0-md5: 2bf94d3e3410dcc74bb0dae10d46a979
+# Source0-md5: 01e3934ca5bd22a80c27289d1b0adcdc
Source1: alsasound.init
# does anything use this (probably outdated) file? not alsasound.init
Source2: alsa-oss-pcm
Source3: alsactl.conf
Patch0: %{name}-fast_sampling.patch
Patch1: %{name}-modprobe.patch
-Patch2: %{name}-missing.patch
URL: http://www.alsa-project.org/
BuildRequires: alsa-lib-devel >= 1.0.27
BuildRequires: autoconf >= 2.59
@@ -108,7 +107,6 @@ Skrypt init dla Advanced Linux Sound Architecture.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__gettextize}
diff --git a/alsa-utils-missing.patch b/alsa-utils-missing.patch
deleted file mode 100644
index e75f366..0000000
--- a/alsa-utils-missing.patch
+++ /dev/null
@@ -1,238 +0,0 @@
---- alsa-utils-1.1.3/alsaucm/alsaucm.rst.orig 1970-01-01 01:00:00.000000000 +0100
-+++ alsa-utils-1.1.3/alsaucm/alsaucm.rst 2017-01-21 19:55:20.071432145 +0100
-@@ -0,0 +1,235 @@
-+=========
-+ alsaucm
-+=========
-+
-+---------------------
-+ALSA Use Case Manager
-+---------------------
-+
-+:Author: Antonio Ospite <ao2 at ao2.it>
-+:Date: 2016-09-22
-+:Copyright: GPLv2+
-+:Manual section: 1
-+:Manual group: General Commands Manual
-+
-+SYNOPSIS
-+========
-+
-+*alsaucm* <options> [command]
-+
-+DESCRIPTION
-+===========
-+
-+alsaucm (ALSA Use Case Manager) is a program to use the ALSA `Use Case
-+Interface`_ from the command line.
-+
-+On complex sound cards, setting up audio routes is not trivial and mixer
-+settings can conflict one another preventing the audio card to work at all.
-+
-+The ALSA Use Case Manager is a mechanism for controlling complex audio
-+hardware establishing a relationship between hardware configurations and
-+meaningful use cases that the end-user can relate with.
-+
-+The use case manager can also be used to switch between use cases when
-+necessary, in a consistent way.
-+
-+At a lower level, the use case manager works by configuring the sound card
-+ALSA kcontrols to change the hardware digital and analog audio routing to
-+match the requested device use case.
-+
-+The use case manager kcontrol configurations are stored in easy to modify text
-+files. An audio use case can be defined by a **verb** and **device** parameter.
-+
-+The verb describes the use case action i.e. a phone call, listening to music,
-+recording a conversation etc. The device describes the physical audio capture
-+and playback hardware i.e. headphones, phone handset, bluetooth headset, etc.
-+
-+
-+OPTIONS
-+=======
-+
-+Available options:
-+
-+ **-h**, **--help**
-+ this help
-+
-+ **-c**, **--card** `NAME`
-+ open card NAME
-+
-+ **-i**, **--interactive**
-+ interactive mode
-+
-+ **-b**, **--batch** `FILE`
-+ batch mode (use ``'-'`` for the stdin input)
-+
-+ **-n**, **--no-open**
-+ do not open first card found
-+
-+
-+Available commands:
-+
-+ ``open`` `NAME`
-+ open card NAME.
-+
-+ valid names are sound card names as listed in ``/usr/share/alsa/ucm``.
-+
-+ ``reset``
-+ reset sound card to default state.
-+
-+ ``reload``
-+ reload configuration.
-+
-+ ``listcards``
-+ list available cards.
-+
-+ ``list`` `IDENTIFIER`
-+ list command, for items returning two entries (value+comment).
-+
-+ the value of the `IDENTIFIER` argument can can be:
-+
-+ - ``_verbs`` - get verb list (in pair verb+comment)
-+ - ``_devices[/{verb}]`` - get list of supported devices (in pair device+comment)
-+ - ``_modifiers[/{verb}]`` - get list of supported modifiers (in pair modifier+comment)
-+
-+ The forms without the trailing ``/{verb}`` are valid only after a specific
-+ verb has been set.
-+
-+ ``list1`` `IDENTIFIER`
-+ list command, for lists returning one item per entry.
-+
-+ the value of the `IDENTIFIER` argument can vary depending on the context,
-+ it can be:
-+
-+ - ``TQ[/{verb}]`` - get list of Tone Quality identifiers
-+ - ``_enadevs`` - get list of enabled devices
-+ - ``_enamods`` - get list of enabled modifiers
-+ - ``_supporteddevs/{modifier}|{device}[/{verb}]`` - list of supported devices
-+ - ``_conflictingdevs/{modifier}|{device}[/{verb}]`` - list of conflicting devices
-+
-+ ``get`` `IDENTIFIER`
-+ get string value.
-+
-+ the value of the `IDENTIFIER` argument can can be:
-+
-+ - ``_verb`` - return current verb
-+ - ``[=]{NAME}[/[{modifier}|{/device}][/{verb}]]`` (For valid NAMEs look at the
-+ ALSA `Use Case Interface`_)
-+
-+
-+ ``geti`` `IDENTIFIER`
-+ get integer value.
-+
-+ the value of the `IDENTIFIER` argument can can be:
-+
-+ - ``_devstatus/{device}``
-+ - ``_modtstaus/{device}``
-+
-+ ``set`` `IDENTIFIER` `VALUE`
-+ set string value
-+
-+ The value of the `IDENTIFIER` argument can can be:
-+
-+ - ``_verb`` - set the verb to `VALUE`
-+ - ``_enadev`` - enable the device specified by `VALUE`
-+ - ``_disdev`` - disable the device specified by `VALUE`
-+ - ``_swdev/{old_device}`` - switche device:
-+
-+ - disable `old_device` and then enable the device specified by
-+ `VALUE`
-+ - if no device was enabled just return
-+
-+ - ``_enamod`` - enable the modifier specified by `VALUE`
-+ - ``_dismod`` - disable the modifier specified by `VALUE`
-+ - ``_swmod/{old_modifier}`` - switch modifier:
-+
-+ - disable `old_modifier` and then enable the modifier specified by
-+ `VALUE`
-+ - if no modifier was enabled just return
-+
-+ Note that the identifiers referring to devices and modifiers are valid
-+ only after setting a verb.
-+
-+ ``h``, ``help``
-+ help
-+
-+ ``q``, ``quit``
-+ quit
-+
-+
-+FILES
-+=====
-+
-+The master use case files for each supported sound card are in ``/usr/share/alsa/ucm``.
-+
-+For example, the master use case file for the `Pandaboard` card is in
-+``/usr/share/alsa/ucm/PandaBoard/PandaBoard.conf``, this file lists all the
-+supported use cases, e.g.
-+
-+::
-+
-+ SectionUseCase."HiFi" {
-+ File "hifi"
-+ Comment "Play HiFi quality Music."
-+ }
-+ ...
-+
-+
-+Each use case defines a _verb, which is described in the file specified in
-+the ``File`` directive, like above.
-+
-+The ``HiFi`` verb above is described in
-+``/usr/share/alsa/ucm/PandaBoard/hifi``.
-+
-+For more details on the syntax of UCM files, see the alsa-lib source code:
-+http://git.alsa-project.org/?p=alsa-lib.git;a=blob;f=src/ucm/parser.c
-+
-+
-+EXAMPLES OF USE
-+===============
-+
-+Some commands, like for instance ``list _devices``,
-+can only work after setting a ``_verb`` in the **same execution**, for
-+instance this sequence doesn't work:
-+
-+::
-+
-+ # alsaucm -c bytcr-rt5640 set _verb HiFi
-+ # alsaucm -c bytcr-rt5640 list _devices
-+
-+
-+However this command does:
-+
-+::
-+
-+ # alsaucm -n -b - <<EOM
-+ open bytcr-rt5640
-+ set _verb HiFi
-+ list _devices
-+ EOM
-+
-+
-+An example of setting the `Speaker` device for the `HiFi` verb of the
-+`bytcr-rt5640` card:
-+
-+::
-+
-+ # alsaucm -n -b - <<EOM
-+ open bytcr-rt5640
-+ reset
-+ set _verb HiFi
-+ set _enadev Speaker
-+ EOM
-+
-+
-+
-+SEE ALSO
-+========
-+
-+* Use Case Interface: http://www.alsa-project.org/alsa-doc/alsa-lib/group__ucm.html
-+
-+.. _Use Case Interface: http://www.alsa-project.org/alsa-doc/alsa-lib/group__ucm.html
-+
-+BUGS
-+====
-+
-+None known.
diff --git a/alsasound.init b/alsasound.init
index a37e667..6c66b7e 100644
--- a/alsasound.init
+++ b/alsasound.init
@@ -99,6 +99,11 @@ start() {
msg_already_running "ALSA driver"
fi
fi
+ # "restore" is handled via udev if running; if not, do it manually
+ if is_no "$START_UDEV" && [ -f /var/lib/alsa/asound.state ]; then
+ sleep 1
+ /sbin/alsactl restore
+ fi
}
# Stop daemons.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/alsa-utils.git/commitdiff/08fa9b0b1f5a8e793a3ed5f8060e3dab1c8e4dfc
More information about the pld-cvs-commit
mailing list