forked from pool/alsa-utils
Accepting request 176753 from home:tiwai:branches:multimedia:libs
- Backport upstream fixes: 0002-alsactl-init-ca0106-file-was-omitted.patch 0003-alsactl-return-back-the-udevrules_DATA-rule-for-90-a.patch - Add missing ca0106 alsactl init file - Revert the udev file drop in the previous commit OBS-URL: https://build.opensuse.org/request/show/176753 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=81
This commit is contained in:
parent
8d81fdc2fb
commit
d177d844c6
36
0002-alsactl-init-ca0106-file-was-omitted.patch
Normal file
36
0002-alsactl-init-ca0106-file-was-omitted.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
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
|
||||||
|
|
@ -0,0 +1,28 @@
|
|||||||
|
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,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 27 09:42:39 CEST 2013 - tiwai@suse.de
|
||||||
|
|
||||||
|
- Backport upstream fixes:
|
||||||
|
0002-alsactl-init-ca0106-file-was-omitted.patch
|
||||||
|
0003-alsactl-return-back-the-udevrules_DATA-rule-for-90-a.patch
|
||||||
|
- Add missing ca0106 alsactl init file
|
||||||
|
- Revert the udev file drop in the previous commit
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu May 23 15:44:23 CEST 2013 - tiwai@suse.de
|
Thu May 23 15:44:23 CEST 2013 - tiwai@suse.de
|
||||||
|
|
||||||
|
@ -28,11 +28,19 @@ BuildRequires: systemd
|
|||||||
%define use_systemd 0
|
%define use_systemd 0
|
||||||
%define use_varlib 0
|
%define use_varlib 0
|
||||||
%endif
|
%endif
|
||||||
|
%if %suse_version > 1200
|
||||||
|
%define _udevdir %(pkg-config --variable=udevdir udev)
|
||||||
|
%else
|
||||||
|
%define _udevdir /lib/udev
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: alsa-utils
|
Name: alsa-utils
|
||||||
BuildRequires: alsa-devel
|
BuildRequires: alsa-devel
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: libsamplerate-devel
|
BuildRequires: libsamplerate-devel
|
||||||
|
%if %suse_version > 1200
|
||||||
|
BuildRequires: libudev-devel
|
||||||
|
%endif
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: xmlto
|
BuildRequires: xmlto
|
||||||
@ -48,9 +56,13 @@ Version: 1.0.27.1
|
|||||||
Release: 0
|
Release: 0
|
||||||
Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2
|
Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2
|
||||||
Source1: 01beep.conf
|
Source1: 01beep.conf
|
||||||
|
# missing in 1.0.27.1 tarball
|
||||||
|
Source99: ca0106
|
||||||
# Patch: alsa-utils-git-fixes.diff
|
# Patch: alsa-utils-git-fixes.diff
|
||||||
# upstream fix patches
|
# upstream fix patches
|
||||||
Patch1: 0001-Require-alsa-lib-1.0.27.patch
|
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
|
||||||
#
|
#
|
||||||
Patch99: alsa-utils-gettext-version-removal.diff
|
Patch99: alsa-utils-gettext-version-removal.diff
|
||||||
Url: http://www.alsa-project.org/
|
Url: http://www.alsa-project.org/
|
||||||
@ -67,6 +79,9 @@ sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am
|
|||||||
# rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-*
|
# rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-*
|
||||||
# patch -p1
|
# patch -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
cp %{S:99} alsactl/init
|
||||||
#
|
#
|
||||||
%if %suse_version < 1020
|
%if %suse_version < 1020
|
||||||
%patch99 -p1
|
%patch99 -p1
|
||||||
@ -88,6 +103,7 @@ opts="$opts --with-asound-state-dir=/etc"
|
|||||||
%if %suse_version < 1030
|
%if %suse_version < 1030
|
||||||
opts="$opts --disable-xmlto"
|
opts="$opts --disable-xmlto"
|
||||||
%endif
|
%endif
|
||||||
|
opts="$opts --with-udev-rules-dir=%{_udevdir}/rules.d"
|
||||||
%configure --with-curses=ncursesw $opts
|
%configure --with-curses=ncursesw $opts
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
@ -117,6 +133,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/alsa
|
|||||||
%{_sbindir}/*
|
%{_sbindir}/*
|
||||||
%{_datadir}/sounds/alsa
|
%{_datadir}/sounds/alsa
|
||||||
%{_datadir}/alsa
|
%{_datadir}/alsa
|
||||||
|
%{_udevdir}
|
||||||
%if %use_systemd
|
%if %use_systemd
|
||||||
%{_unitdir}/*.service
|
%{_unitdir}/*.service
|
||||||
%{_unitdir}/basic.target.wants/alsa-state.service
|
%{_unitdir}/basic.target.wants/alsa-state.service
|
||||||
|
31
ca0106
Normal file
31
ca0106
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
# 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