import alsa-lib-1.2.1.2-3.el8

This commit is contained in:
CentOS Sources 2020-04-28 04:52:57 -04:00 committed by Andrew Lukoshko
parent f944474b02
commit 5439d54169
5 changed files with 1144 additions and 2108 deletions

View File

@ -1 +1,3 @@
2404e1c377428908c5188076d5652a2a1ecd028e SOURCES/alsa-lib-1.1.9.tar.bz2
b58599c1237b2525962ed190ef501d3b9aa6edf5 SOURCES/alsa-lib-1.2.1.2.tar.bz2
93fbe39ec099778e67e8ab2ef3780e08893f0176 SOURCES/alsa-topology-conf-1.2.1.tar.bz2
b4b6070fb3335dcd750718da664b7cba47a3f285 SOURCES/alsa-ucm-conf-1.2.1.2.tar.bz2

4
.gitignore vendored
View File

@ -1 +1,3 @@
SOURCES/alsa-lib-1.1.9.tar.bz2
SOURCES/alsa-lib-1.2.1.2.tar.bz2
SOURCES/alsa-topology-conf-1.2.1.tar.bz2
SOURCES/alsa-ucm-conf-1.2.1.2.tar.bz2

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,169 @@
# Use case Configuration for sof-hda-dsp
SectionVerb {
EnableSequence [
cset "name='Auto-Mute Mode' 'Disabled'"
cset "name='Master Playback Volume' 100"
cset "name='Speaker Playback Volume' 100"
cset "name='Headphone Playback Volume' 100"
cset "name='Capture Volume' 50"
cset "name='Mic Boost Volume' 100"
cset "name='Dmic0 Capture Volume' 100"
]
}
SectionDevice."Headphones1" {
Comment "Headphones"
EnableSequence [
cset "name='Headphone Playback Switch' on"
]
DisableSequence [
cset "name='Headphone Playback Switch' off"
]
Value {
PlaybackPriority 200
PlaybackPCM "hw:${CardId},0"
PlaybackMixerElem "Headphone"
PlaybackMixerMaster "Master"
PlaybackVolume "Headphone Playback Volume"
PlaybackSwitch "Headphone Playback Switch"
PlaybackChannels "2"
If.jack {
Condition {
Type ControlExists
Control "iface=CARD,name='Headphone Mic Jack'"
}
True {
JackControl "Headphone Mic Jack"
}
False {
JackControl "Headphone Jack"
}
}
}
}
SectionDevice."Speaker" {
Comment "Speaker"
If.seq {
Condition {
Type ControlExists
Control "name='Bass Speaker Playback Switch'"
}
True {
EnableSequence [
cset "name='Speaker Playback Switch' on"
cset "name='Bass Speaker Playback Switch' on"
]
DisableSequence [
cset "name='Speaker Playback Switch' off"
cset "name='Bass Speaker Playback Switch' off"
]
}
False {
EnableSequence [
cset "name='Speaker Playback Switch' on"
]
DisableSequence [
cset "name='Speaker Playback Switch' off"
]
}
}
Value {
PlaybackPriority 100
PlaybackPCM "hw:${CardId},0"
PlaybackMixerElem "Speaker"
PlaybackMasterElem "Master"
PlaybackVolume "Speaker Playback Volume"
PlaybackSwitch "Speaker Playback Switch"
PlaybackChannels "2"
}
}
If.monomic {
Condition {
Type ControlExists
Control "name='Input Source'"
ControlEnum "Headphone Mic"
}
After.SectionDevice "Mic"
True {
SectionDevice."Headphones2" {
Comment "Headphones Stereo Microphone"
ConflictingDevice [
"HeadsetMic"
]
EnableSequence [
cset "name='Input Source' 'Headphone Mic'"
]
Value {
CapturePriority 200
<sof-hda-dsp/HDA-Capture-value.conf>
JackControl "Headphone Mic Jack"
}
}
SectionDevice."Headset" {
Comment "Headset Mono Microphone"
EnableSequence [
cset "name='Input Source' Headset Mic"
]
Value {
CapturePriority 300
<sof-hda-dsp/HDA-Capture-value.conf>
JackControl "Headphone Mic Jack"
}
}
}
False {
SectionDevice."Headphones2" {
Comment "Headphones Stereo Microphone"
Value {
CapturePriority 200
<sof-hda-dsp/HDA-Capture-value.conf>
JackControl "Mic Jack"
}
}
}
}
SectionDevice."Mic" {
Comment "Digital Microphone"
Value {
CapturePriority 100
CapturePCM "hw:${CardId},6"
CaptureChannels 4
If.vol {
Condition {
Type ControlExists
Control "name='Dmic0 Capture Switch'"
}
True {
CaptureMixerElem "Dmic0"
CaptureVolume "Dmic0 Capture Volume"
CaptureSwitch "Dmic0 Capture Switch"
}
False {
# v1.3 SOF firmware
CaptureMixerElem "PGA10.0 10 Master"
CaptureVolume "PGA10.0 10 Master Capture Volume"
}
}
}
}
<sof-hda-dsp/Hdmi.conf>

View File

@ -2,18 +2,25 @@
#define prever_dot .rc3
#define postver a
%define version_alsa_lib 1.2.1.2
%define version_alsa_ucm 1.2.1.2
%define version_alsa_tplg 1.2.1
Summary: The Advanced Linux Sound Architecture (ALSA) library
Name: alsa-lib
Version: 1.1.9
Release: 4%{?prever_dot}%{?dist}
Version: %{version_alsa_lib}
Release: 3%{?prever_dot}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.alsa-project.org/
Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{version_alsa_ucm}.tar.bz2
Source2: ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{version_alsa_tplg}.tar.bz2
Source10: asound.conf
Source11: modprobe-dist-alsa.conf
Source12: modprobe-dist-oss.conf
Source20: sof-hda-dsp-HiFi.conf
Patch0: alsa-git.patch
Patch1: alsa-lib-1.1.9-config.patch
Patch2: alsa-lib-1.0.14-glibc-open.patch
@ -47,7 +54,8 @@ against the ALSA libraries and interfaces.
Summary: ALSA Use Case Manager configuration
Group: System Environment/Libraries
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
License: BSD
Requires: %{name} >= %{version_alsa_ucm}
%description -n alsa-ucm
The Advanced Linux Sound Architecture (ALSA) Universal Configuration
@ -57,7 +65,8 @@ Manager allows configuration of Audio input/output names and routing
Summary: ALSA Topology configuration
Group: System Environment/Libraries
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
License: BSD
Requires: %{name} >= %{version_alsa_tplg}
%description -n alsa-topology
The Advanced Linux Sound Architecture (ALSA) topology configuration
@ -89,6 +98,8 @@ make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/%{_lib}
mv %{buildroot}%{_libdir}/libasound.so.* %{buildroot}/%{_lib}
ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
mv %{buildroot}%{_libdir}/libatopology.so.* %{buildroot}/%{_lib}
ln -snf ../../%{_lib}/libatopology.so.2 %{buildroot}%{_libdir}/libatopology.so
# Install global configuration files
mkdir -p -m 755 %{buildroot}/etc
@ -100,12 +111,27 @@ install -p -m 644 %{SOURCE11} %{buildroot}%{sysmodprobedir}/dist-alsa.conf
# bug#926973, place this file to the doc directory
install -p -m 644 %{SOURCE12} .
# Create UCM directory
# Create UCM directories
mkdir -p %{buildroot}/%{_datadir}/alsa/ucm
mkdir -p %{buildroot}/%{_datadir}/alsa/ucm2
# Unpack UCMs
tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa ucm ucm2
# Workaround for buggy paths in alsa-lib
ln -s 'HDA Intel PCH' %{buildroot}/%{_datadir}/alsa/ucm2/HDAudio-Lenovo-DualCodecs
ln -s 'HDA Intel PCH' %{buildroot}/%{_datadir}/alsa/ucm2/HDAudio-Gigabyte-ALC1220DualCodecs
# Workaround for old pulseaudio
if [ "%version_alsa_ucm" != "1.2.1.2" ]; then echo "Remove!"; exit 1; fi
cp %{SOURCE20} %{buildroot}/%{_datadir}/alsa/ucm2/sof-hda-dsp/HiFi.conf
# Create topology directory
mkdir -p %{buildroot}/%{_datadir}/alsa/topology
# Unpack topologies
tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa topology
# Remove libtool archives.
find %{buildroot} -name '*.la' -delete
@ -122,10 +148,12 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
%doc doc/asoundrc.txt modprobe-dist-oss.conf
%config %{_sysconfdir}/asound.conf
/%{_lib}/libasound.so.*
/%{_lib}/libatopology.so.*
%{_bindir}/aserver
#{_libdir}/alsa-lib/
%{_datadir}/alsa/
%exclude %{_datadir}/alsa/ucm
%exclude %{_datadir}/alsa/ucm2
%exclude %{_datadir}/alsa/topology
%{sysmodprobedir}/dist-*
@ -134,16 +162,31 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
%{_includedir}/alsa/
%{_includedir}/sys/asoundlib.h
%{_libdir}/libasound.so
%{_libdir}/libatopology.so
%{_libdir}/pkgconfig/alsa.pc
%{_libdir}/pkgconfig/alsa-topology.pc
%{_datadir}/aclocal/alsa.m4
%files -n alsa-ucm
# BSD
%{_datadir}/alsa/ucm
%{_datadir}/alsa/ucm2
%files -n alsa-topology
# BSD
%{_datadir}/alsa/topology
%changelog
* Tue Mar 17 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-3
- Fix for HDA Intel dual codecs
* Tue Dec 10 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-2
- Updated to 1.2.1.2
- UCM fixes
* Fri Nov 15 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1-2
- Updated to 1.2.1
* Mon May 27 2019 Jaroslav Kysela <perex@perex.cz> - 1.1.9-4
- Moved topology files to alsa-topology
- Updated to 1.1.9