packages/alsa-lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 update to 1.2.2

Browse Source 
Merge pull request !2 from SuperHugePan/master
This commit is contained in:
openeuler-ci-bot 2020-05-12 15:58:00 +08:00 committed by Gitee
commit 20a6dccdcd
5 changed files with 8 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
alsa-lib-1.1.6.tar.bz2
View File

Binary file not shown.

BIN
alsa-lib-1.2.2.tar.bz2 Normal file
View File

Binary file not shown.

13
alsa-lib.spec
View File

@ -1,6 +1,6 @@
Name: alsa-lib
Version: 1.1.6
Release: 6
Version: 1.2.2
Release: 1
Summary: the user space library that developers compile ALSA applications against
License: LGPLv2+
@ -8,9 +8,6 @@ URL: https://alsa-project.org/
Source0: https://www.alsa-project.org/files/pub/lib/%{name}-%{version}.tar.bz2
Source10: asound.conf
Patch0: alsa.conf-change-the-location-for-add-on-configs-to-.patch
Patch1: conf-remove-alsa.conf.d-from-the-datadir.patch
BuildRequires: autoconf, automake, libtool, doxygen
Requires: coreutils
@ -58,18 +55,24 @@ install -p -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}
%{_sysconfdir}/*.conf
%{_bindir}/*
%{_libdir}/libasound.so.*
%{_libdir}/libatopology.so.*
%{_datadir}/alsa/*
%files devel
%doc doc/doxygen/ TODO
%{_libdir}/libasound.so
%{_libdir}/libatopology.so
%exclude %{_libdir}/libasound.la
%exclude %{_libdir}/libatopology.la
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*
%{_datadir}/aclocal/*.m4
%changelog
* Fri Apr 24 2020 SuperHugePan <zhangpan26@huawei.com> - 1.2.2-1
- update to 1.2.2
* Fri Jan 10 2020 SuperHugePan <zhangpan26@huawei.com> - 1.1.6-6
- remove useless code

35
alsa.conf-change-the-location-for-add-on-configs-to-.patch
View File

@ -1,35 +0,0 @@
From 93e03bdc2a3dcd5d12516f5de78e14d88a32ff2c Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 4 Apr 2018 09:58:12 +0200
Subject: [PATCH] alsa.conf: change the location for add-on configs to
/etc/alsa/conf.d
The add-on configuration files should be placed to a volatile place.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/conf/alsa.conf | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
index f22918f..bb00ff4 100644
--- a/src/conf/alsa.conf
+++ b/src/conf/alsa.conf
@@ -8,13 +8,7 @@
{
func load
files [
- {
- @func concat
- strings [
- { @func datadir }
- "/alsa.conf.d/"
- ]
- }
+ "/etc/alsa/conf.d"
"/etc/asound.conf"
"~/.asoundrc"
]
--
1.8.3.1

49
conf-remove-alsa.conf.d-from-the-datadir.patch
View File

@ -1,49 +0,0 @@
From 78505dccd23546cc77e5221cb21c01325bc0138d Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 4 Apr 2018 10:02:49 +0200
Subject: [PATCH] conf: remove alsa.conf.d from the datadir
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/conf/Makefile.am | 2 +-
src/conf/alsa.conf.d/Makefile.am | 8 --------
src/conf/alsa.conf.d/README | 2 --
3 files changed, 1 insertion(+), 11 deletions(-)
delete mode 100644 src/conf/alsa.conf.d/Makefile.am
delete mode 100644 src/conf/alsa.conf.d/README
diff --git a/src/conf/Makefile.am b/src/conf/Makefile.am
index ef2ea9c..2b46f95 100644
--- a/src/conf/Makefile.am
+++ b/src/conf/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=cards pcm alsa.conf.d
+SUBDIRS=cards pcm
if BUILD_UCM
SUBDIRS += ucm
diff --git a/src/conf/alsa.conf.d/Makefile.am b/src/conf/alsa.conf.d/Makefile.am
deleted file mode 100644
index c91661e..0000000
--- a/src/conf/alsa.conf.d/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-alsaconfigdir = @ALSA_CONFIG_DIR@
-alsadir = $(alsaconfigdir)/alsa.conf.d
-cfg_files = README
-
-alsa_DATA = $(cfg_files)
-
-EXTRA_DIST = \
- $(cfg_files)
diff --git a/src/conf/alsa.conf.d/README b/src/conf/alsa.conf.d/README
deleted file mode 100644
index 9997884..0000000
--- a/src/conf/alsa.conf.d/README
+++ /dev/null
@@ -1,2 +0,0 @@
-You can place files named *.conf in this folder and they will be processed
-when initialising alsa-lib.
--
1.8.3.1