Compare commits
14 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
938e66db7a | ||
|
|
19c50b4748 | ||
|
|
318de9d2f2 | ||
|
|
bb2577b342 | ||
|
|
f1c8c96f2c | ||
|
|
0b87105880 | ||
|
|
3621298375 | ||
|
|
2f5c023b62 | ||
|
|
38968a4a51 | ||
|
|
757aa287e7 | ||
|
|
f8d499be95 | ||
|
|
f52bddc5f8 | ||
|
|
84307397e3 | ||
|
|
6a5408ffd1 |
7 changed files with 53 additions and 28294 deletions
22620
alsa-git.patch
22620
alsa-git.patch
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
|
||||
index 09980586..c4525f0b 100644
|
||||
index 18427ec6..1915af4e 100644
|
||||
--- a/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.minperiodtime 5000 # in us
|
||||
defaults.pcm.ipc_key 5678293
|
||||
-defaults.pcm.ipc_gid audio
|
||||
-defaults.pcm.ipc_perm 0660
|
||||
+defaults.pcm.ipc_perm 0600
|
||||
defaults.pcm.tstamp_type default
|
||||
defaults.pcm.dmix.max_periods 0
|
||||
defaults.pcm.dmix.channels 2
|
||||
defaults.pcm.dmix.rate 48000
|
||||
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
|
||||
+++ b/src/conf/pcm/dmix.conf
|
||||
@@ -48,10 +48,6 @@ pcm.!dmix {
|
||||
|
|
@ -28,7 +28,7 @@ index 7fa5c8b2..97936a82 100644
|
|||
@func refer
|
||||
name defaults.pcm.ipc_perm
|
||||
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
|
||||
+++ b/src/conf/pcm/dsnoop.conf
|
||||
@@ -41,10 +41,6 @@ pcm.!dsnoop {
|
||||
|
|
@ -2,14 +2,14 @@
|
|||
#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
|
||||
%define version_alsa_lib 1.2.3.2
|
||||
%define version_alsa_ucm 1.2.3
|
||||
%define version_alsa_tplg 1.2.3
|
||||
|
||||
Summary: The Advanced Linux Sound Architecture (ALSA) library
|
||||
Name: alsa-lib
|
||||
Version: %{version_alsa_lib}
|
||||
Release: 6%{?prever_dot}%{?dist}
|
||||
Release: 1%{?prever_dot}%{?dist}
|
||||
License: LGPLv2+
|
||||
URL: http://www.alsa-project.org/
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ Source11: modprobe-dist-alsa.conf
|
|||
Source12: modprobe-dist-oss.conf
|
||||
Source40: alsa-ucm-conf.patch
|
||||
Patch0: alsa-git.patch
|
||||
Patch1: alsa-lib-1.1.9-config.patch
|
||||
Patch1: alsa-lib-1.2.3.1-config.patch
|
||||
Patch2: alsa-lib-1.0.14-glibc-open.patch
|
||||
|
||||
BuildRequires: doxygen
|
||||
|
|
@ -89,13 +89,6 @@ make doc
|
|||
|
||||
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
|
||||
mkdir -p -m 755 %{buildroot}/etc
|
||||
install -p -m 644 %{SOURCE10} %{buildroot}/etc
|
||||
|
|
@ -111,14 +104,14 @@ mkdir -p %{buildroot}/%{_datadir}/alsa/ucm
|
|||
mkdir -p %{buildroot}/%{_datadir}/alsa/ucm2
|
||||
|
||||
# Unpack UCMs
|
||||
tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa ucm ucm2
|
||||
tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/ucm" "*/ucm2"
|
||||
patch -d %{buildroot}/%{_datadir}/alsa -p1 < %{SOURCE40}
|
||||
|
||||
# Create topology directory
|
||||
mkdir -p %{buildroot}/%{_datadir}/alsa/topology
|
||||
|
||||
# Unpack topologies
|
||||
tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa topology
|
||||
tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/topology"
|
||||
|
||||
# Remove libtool archives.
|
||||
find %{buildroot} -name '*.la' -delete
|
||||
|
|
@ -133,8 +126,8 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
|
|||
%license COPYING
|
||||
%doc doc/asoundrc.txt modprobe-dist-oss.conf
|
||||
%config %{_sysconfdir}/asound.conf
|
||||
/%{_lib}/libasound.so.*
|
||||
/%{_lib}/libatopology.so.*
|
||||
/%{_libdir}/libasound.so.*
|
||||
/%{_libdir}/libatopology.so.*
|
||||
%{_bindir}/aserver
|
||||
#{_libdir}/alsa-lib/
|
||||
%{_datadir}/alsa/
|
||||
|
|
@ -163,6 +156,21 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
|
|||
%{_datadir}/alsa/topology
|
||||
|
||||
%changelog
|
||||
* Mon Jun 29 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.3.2-1
|
||||
- update to 1.2.3.2
|
||||
|
||||
* Thu Jun 18 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.3.1-1
|
||||
- update to 1.2.3.1
|
||||
|
||||
* Sun Jun 7 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.3-8
|
||||
- update to 1.2.3
|
||||
|
||||
* Mon Apr 6 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.2-2
|
||||
- UCM2 fixes (RemoveDevice), bug#1786723
|
||||
|
||||
* Wed Feb 19 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.2-1
|
||||
- Updated to 1.2.2
|
||||
|
||||
* Sun Feb 9 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-6
|
||||
- More UCM2 related fixes
|
||||
|
||||
|
|
|
|||
5648
alsa-ucm-conf.patch
5648
alsa-ucm-conf.patch
File diff suppressed because it is too large
Load diff
8
sources
8
sources
|
|
@ -1,5 +1,3 @@
|
|||
SHA512 (alsa-lib-1.2.1.1.tar.bz2) = 8a0b6f1ecc58d60991b4509e791b1581eebae57cd754b0b4829e66b1cfee81d588b04f42a17f598f06310b9658d9f46fd748cca516cc48b6f2989389c22c42e9
|
||||
SHA512 (alsa-ucm-conf-1.2.1.tar.bz2) = 277e335fff02973628454aca4c8e275e49965cfe1b4a0bc7a6c4833ea14537b39f8175dd0c974577aa98c95e4f7f0981078d70f8a5f083f7c15ab2445f851255
|
||||
SHA512 (alsa-topology-conf-1.2.1.tar.bz2) = 3480e58f12aeca04b0c1821e074daeb369949acbcf7bc61b09895ee43de84cb716566518a56a4d681babbb3f13faace5a16fff079d8bdaefc7c27fc1382cd41a
|
||||
SHA512 (alsa-ucm-conf-1.2.1.2.tar.bz2) = e498c4355a765eb6ecd03f03611c8904f757bf73619a3c8159c044f80a4c3ab5cbd343692c227e13c6da307fc2e35259b4726902d3ab8e03eff11aa1c74027d5
|
||||
SHA512 (alsa-lib-1.2.1.2.tar.bz2) = e8286fd55f63ee0d95513279d0885c287533de89b7af6c338413dec5d38ba4f5a15da1a4a4ce36e052614e4b730e3778782dab9979d82958283be17b48604913
|
||||
SHA512 (alsa-lib-1.2.3.2.tar.bz2) = 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
|
||||
SHA512 (alsa-ucm-conf-1.2.3.tar.bz2) = 1bdb024170f1dc18170c1d3699798c14d9cc7bbaccfe6eaef1fac0ec8c28074d08ed722bf47996682d4a0737138112b7eb4d45e224f00b027b3331da728e47cd
|
||||
SHA512 (alsa-topology-conf-1.2.3.tar.bz2) = e57439212fd76d1d0c1677654ae7cecef0f89c01a6c57f5f00a02ecd2f6d9f22dc31ed4f301cf82464d98ac32c01f2015a91a5b51d08268ddfeb4265e9b951b9
|
||||
|
|
|
|||
10
tests/run_tests.sh
Executable file
10
tests/run_tests.sh
Executable file
|
|
@ -0,0 +1,10 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
# a quick PCM API test
|
||||
str=$(aplay -L | grep -E "^null$")
|
||||
if [ "$str" != "null" ]; then
|
||||
echo "The 'null' pcm plugin was not found!"
|
||||
exit 99
|
||||
fi
|
||||
11
tests/tests.yml
Normal file
11
tests/tests.yml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
required_packages:
|
||||
- alsa-utils
|
||||
tests:
|
||||
- simple:
|
||||
dir: .
|
||||
run: ./run_tests.sh
|
||||
Loading…
Add table
Add a link
Reference in a new issue