import alsa-lib-1.2.3.2-1.el8
This commit is contained in:
parent
5439d54169
commit
d153a0e432
@ -1,3 +1,3 @@
|
|||||||
b58599c1237b2525962ed190ef501d3b9aa6edf5 SOURCES/alsa-lib-1.2.1.2.tar.bz2
|
2dfe24ae4872c0a390791a515d50de4047eff02b SOURCES/alsa-lib-1.2.3.2.tar.bz2
|
||||||
93fbe39ec099778e67e8ab2ef3780e08893f0176 SOURCES/alsa-topology-conf-1.2.1.tar.bz2
|
0274de50ead268d6d35da4593a5c3abfe8ce4c05 SOURCES/alsa-topology-conf-1.2.3.tar.bz2
|
||||||
b4b6070fb3335dcd750718da664b7cba47a3f285 SOURCES/alsa-ucm-conf-1.2.1.2.tar.bz2
|
54f9411950a2b7a87cf80ca34ee61adac96dfd27 SOURCES/alsa-ucm-conf-1.2.3.tar.bz2
|
||||||
|
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,3 +1,3 @@
|
|||||||
SOURCES/alsa-lib-1.2.1.2.tar.bz2
|
SOURCES/alsa-lib-1.2.3.2.tar.bz2
|
||||||
SOURCES/alsa-topology-conf-1.2.1.tar.bz2
|
SOURCES/alsa-topology-conf-1.2.3.tar.bz2
|
||||||
SOURCES/alsa-ucm-conf-1.2.1.2.tar.bz2
|
SOURCES/alsa-ucm-conf-1.2.3.tar.bz2
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,19 +1,19 @@
|
|||||||
diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
|
diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
|
||||||
index 09980586..c4525f0b 100644
|
index 18427ec6..1915af4e 100644
|
||||||
--- a/src/conf/alsa.conf
|
--- a/src/conf/alsa.conf
|
||||||
+++ b/src/conf/alsa.conf
|
+++ b/src/conf/alsa.conf
|
||||||
@@ -67,8 +67,7 @@ defaults.pcm.nonblock 1
|
@@ -80,8 +80,7 @@ defaults.pcm.nonblock 1
|
||||||
defaults.pcm.compat 0
|
defaults.pcm.compat 0
|
||||||
defaults.pcm.minperiodtime 5000 # in us
|
defaults.pcm.minperiodtime 5000 # in us
|
||||||
defaults.pcm.ipc_key 5678293
|
defaults.pcm.ipc_key 5678293
|
||||||
-defaults.pcm.ipc_gid audio
|
-defaults.pcm.ipc_gid audio
|
||||||
-defaults.pcm.ipc_perm 0660
|
-defaults.pcm.ipc_perm 0660
|
||||||
+defaults.pcm.ipc_perm 0600
|
+defaults.pcm.ipc_perm 0600
|
||||||
|
defaults.pcm.tstamp_type default
|
||||||
defaults.pcm.dmix.max_periods 0
|
defaults.pcm.dmix.max_periods 0
|
||||||
defaults.pcm.dmix.channels 2
|
defaults.pcm.dmix.channels 2
|
||||||
defaults.pcm.dmix.rate 48000
|
|
||||||
diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
|
diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
|
||||||
index 7fa5c8b2..97936a82 100644
|
index 50e573da..70523f29 100644
|
||||||
--- a/src/conf/pcm/dmix.conf
|
--- a/src/conf/pcm/dmix.conf
|
||||||
+++ b/src/conf/pcm/dmix.conf
|
+++ b/src/conf/pcm/dmix.conf
|
||||||
@@ -48,10 +48,6 @@ pcm.!dmix {
|
@@ -48,10 +48,6 @@ pcm.!dmix {
|
||||||
@ -28,7 +28,7 @@ index 7fa5c8b2..97936a82 100644
|
|||||||
@func refer
|
@func refer
|
||||||
name defaults.pcm.ipc_perm
|
name defaults.pcm.ipc_perm
|
||||||
diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf
|
diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf
|
||||||
index abbd44f7..528fb6ad 100644
|
index f4336e5f..60b9f212 100644
|
||||||
--- a/src/conf/pcm/dsnoop.conf
|
--- a/src/conf/pcm/dsnoop.conf
|
||||||
+++ b/src/conf/pcm/dsnoop.conf
|
+++ b/src/conf/pcm/dsnoop.conf
|
||||||
@@ -41,10 +41,6 @@ pcm.!dsnoop {
|
@@ -41,10 +41,6 @@ pcm.!dsnoop {
|
@ -1,169 +0,0 @@
|
|||||||
# 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>
|
|
@ -2,14 +2,14 @@
|
|||||||
#define prever_dot .rc3
|
#define prever_dot .rc3
|
||||||
#define postver a
|
#define postver a
|
||||||
|
|
||||||
%define version_alsa_lib 1.2.1.2
|
%define version_alsa_lib 1.2.3.2
|
||||||
%define version_alsa_ucm 1.2.1.2
|
%define version_alsa_ucm 1.2.3
|
||||||
%define version_alsa_tplg 1.2.1
|
%define version_alsa_tplg 1.2.3
|
||||||
|
|
||||||
Summary: The Advanced Linux Sound Architecture (ALSA) library
|
Summary: The Advanced Linux Sound Architecture (ALSA) library
|
||||||
Name: alsa-lib
|
Name: alsa-lib
|
||||||
Version: %{version_alsa_lib}
|
Version: %{version_alsa_lib}
|
||||||
Release: 3%{?prever_dot}%{?dist}
|
Release: 1%{?prever_dot}%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.alsa-project.org/
|
URL: http://www.alsa-project.org/
|
||||||
@ -20,9 +20,8 @@ Source2: ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{version_alsa_t
|
|||||||
Source10: asound.conf
|
Source10: asound.conf
|
||||||
Source11: modprobe-dist-alsa.conf
|
Source11: modprobe-dist-alsa.conf
|
||||||
Source12: modprobe-dist-oss.conf
|
Source12: modprobe-dist-oss.conf
|
||||||
Source20: sof-hda-dsp-HiFi.conf
|
|
||||||
Patch0: alsa-git.patch
|
Patch0: alsa-git.patch
|
||||||
Patch1: alsa-lib-1.1.9-config.patch
|
Patch1: alsa-lib-1.2.3-config.patch
|
||||||
Patch2: alsa-lib-1.0.14-glibc-open.patch
|
Patch2: alsa-lib-1.0.14-glibc-open.patch
|
||||||
|
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -94,13 +93,6 @@ make doc
|
|||||||
|
|
||||||
make DESTDIR=%{buildroot} install
|
make DESTDIR=%{buildroot} install
|
||||||
|
|
||||||
# We need the library to be available even before /usr might be mounted
|
|
||||||
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
|
# Install global configuration files
|
||||||
mkdir -p -m 755 %{buildroot}/etc
|
mkdir -p -m 755 %{buildroot}/etc
|
||||||
install -p -m 644 %{SOURCE10} %{buildroot}/etc
|
install -p -m 644 %{SOURCE10} %{buildroot}/etc
|
||||||
@ -116,21 +108,13 @@ mkdir -p %{buildroot}/%{_datadir}/alsa/ucm
|
|||||||
mkdir -p %{buildroot}/%{_datadir}/alsa/ucm2
|
mkdir -p %{buildroot}/%{_datadir}/alsa/ucm2
|
||||||
|
|
||||||
# Unpack UCMs
|
# Unpack UCMs
|
||||||
tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa ucm ucm2
|
tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/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
|
# Create topology directory
|
||||||
mkdir -p %{buildroot}/%{_datadir}/alsa/topology
|
mkdir -p %{buildroot}/%{_datadir}/alsa/topology
|
||||||
|
|
||||||
# Unpack topologies
|
# Unpack topologies
|
||||||
tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa topology
|
tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/topology"
|
||||||
|
|
||||||
# Remove libtool archives.
|
# Remove libtool archives.
|
||||||
find %{buildroot} -name '*.la' -delete
|
find %{buildroot} -name '*.la' -delete
|
||||||
@ -147,8 +131,8 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
|
|||||||
%license COPYING
|
%license COPYING
|
||||||
%doc doc/asoundrc.txt modprobe-dist-oss.conf
|
%doc doc/asoundrc.txt modprobe-dist-oss.conf
|
||||||
%config %{_sysconfdir}/asound.conf
|
%config %{_sysconfdir}/asound.conf
|
||||||
/%{_lib}/libasound.so.*
|
/%{_libdir}/libasound.so.*
|
||||||
/%{_lib}/libatopology.so.*
|
/%{_libdir}/libatopology.so.*
|
||||||
%{_bindir}/aserver
|
%{_bindir}/aserver
|
||||||
#{_libdir}/alsa-lib/
|
#{_libdir}/alsa-lib/
|
||||||
%{_datadir}/alsa/
|
%{_datadir}/alsa/
|
||||||
@ -177,6 +161,9 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
|
|||||||
%{_datadir}/alsa/topology
|
%{_datadir}/alsa/topology
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 29 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.3.2-1
|
||||||
|
- update to 1.2.3.2
|
||||||
|
|
||||||
* Tue Mar 17 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-3
|
* Tue Mar 17 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-3
|
||||||
- Fix for HDA Intel dual codecs
|
- Fix for HDA Intel dual codecs
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user