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

!1 remove useless code

Browse Source 
Merge pull request !1 from SuperHugePan/test
This commit is contained in:
openeuler-ci-bot 2020-01-10 22:24:04 +08:00 committed by Gitee
commit 3d2f0511d8
8 changed files with 47 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
alsa-lib-1.0.14-glibc-open.patch
View File

@ -1,11 +0,0 @@
--- alsa-lib-1.0.14/aserver/aserver.c 2007-05-31 10:05:13.000000000 +0200
+++ alsa-lib-1.0.14.lennart/aserver/aserver.c 2007-08-15 15:53:32.000000000 +0200
@@ -35,6 +35,8 @@
#include "aserver.h"
+#undef open
+
char *command;
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)

44
alsa-lib-1.0.24-config.patch
View File

@ -1,44 +0,0 @@
diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
index 1889f01..60c12ac 100644
--- a/src/conf/alsa.conf
+++ b/src/conf/alsa.conf
@@ -66,8 +66,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.dmix.max_periods 0
defaults.pcm.dmix.rate 48000
defaults.pcm.dmix.format "unchanged"
diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
index e62cb29..a005488 100644
--- a/src/conf/pcm/dmix.conf
+++ b/src/conf/pcm/dmix.conf
@@ -41,10 +41,6 @@ pcm.!dmix {
@func refer
name defaults.pcm.ipc_key
}
- ipc_gid {
- @func refer
- name defaults.pcm.ipc_gid
- }
ipc_perm {
@func refer
name defaults.pcm.ipc_perm
diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf
index 49cfca9..842e1fb 100644
--- a/src/conf/pcm/dsnoop.conf
+++ b/src/conf/pcm/dsnoop.conf
@@ -41,10 +41,6 @@ pcm.!dsnoop {
@func refer
name defaults.pcm.ipc_key
}
- ipc_gid {
- @func refer
- name defaults.pcm.ipc_gid
- }
ipc_perm {
@func refer
name defaults.pcm.ipc_perm

21
alsa-lib.spec
View File

@ -1,18 +1,15 @@
Name: alsa-lib
Version: 1.1.6
Release: 5
Release: 6
Summary: the user space library that developers compile ALSA applications against
License: LGPLv2+
URL: https://alsa-project.org/
Source0: https://www.alsa-project.org/files/pub/lib/%{name}-%{version}.tar.bz2
Source10: asound.conf
Source11: modprobe-dist-alsa.conf
Source12: modprobe-dist-oss.conf
Patch0: alsa-lib-1.0.24-config.patch
Patch1: alsa-lib-1.0.14-glibc-open.patch
Patch2: alsa-lib-addon-dir.patch
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
@ -53,21 +50,12 @@ make install DESTDIR=%{buildroot}
mkdir -p -m 755 %{buildroot}%{_sysconfdir}
install -p -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}
# install alsa modprobe configure file ,backup oss modprobe configure file
mkdir -p -m 755 %{buildroot}%{_prefix}/lib/modprobe.d/
install -p -m 0644 %{SOURCE11} %{buildroot}%{_prefix}/lib/modprobe.d/dist-alsa.conf
mkdir -p -m 755 %{buildroot}/%{_defaultdocdir}/%{name}
install -p -m 0644 %{SOURCE12} %{buildroot}%{_defaultdocdir}/%{name}/
%ldconfig_scriptlets
%files
%license COPYING
%doc doc/asoundrc.txt
%{_sysconfdir}/*.conf
%{_prefix}/lib/modprobe.d/*.conf
%{_defaultdocdir}/%{name}/*.conf
%{_bindir}/*
%{_libdir}/libasound.so.*
%{_datadir}/alsa/*
@ -82,6 +70,9 @@ install -p -m 0644 %{SOURCE12} %{buildroot}%{_defaultdocdir}/%{name}/
%changelog
* Fri Jan 10 2020 SuperHugePan <zhangpan26@huawei.com> - 1.1.6-6
- remove useless code
* Thu Oct 24 2019 caomeng <caomeng5@huawei.com> - 1.1.6-5
- Type:NA
- ID:NA

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

@ -0,0 +1,35 @@
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

4
asound.conf
View File

@ -1,3 +1 @@
#
# Place your global alsa-lib configuration here...
#
# alsa-lib global configuration

46
alsa-lib-addon-dir.patch → conf-remove-alsa.conf.d-from-the-datadir.patch
View File

@ -1,43 +1,7 @@
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 1/2] 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 f22918fb..bb00ff40 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"
]
--
2.13.6
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 2/2] conf: remove alsa.conf.d from the datadir
Subject: [PATCH] conf: remove alsa.conf.d from the datadir
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
@ -49,7 +13,7 @@ Signed-off-by: Jaroslav Kysela <perex@perex.cz>
delete mode 100644 src/conf/alsa.conf.d/README
diff --git a/src/conf/Makefile.am b/src/conf/Makefile.am
index ef2ea9c1..2b46f95c 100644
index ef2ea9c..2b46f95 100644
--- a/src/conf/Makefile.am
+++ b/src/conf/Makefile.am
@@ -1,4 +1,4 @@
@ -60,7 +24,7 @@ index ef2ea9c1..2b46f95c 100644
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 c91661e9..00000000
index c91661e..0000000
--- a/src/conf/alsa.conf.d/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
@ -74,12 +38,12 @@ index c91661e9..00000000
- $(cfg_files)
diff --git a/src/conf/alsa.conf.d/README b/src/conf/alsa.conf.d/README
deleted file mode 100644
index 99978848..00000000
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.
--
2.13.6
1.8.3.1

9
modprobe-dist-alsa.conf
View File

@ -1,9 +0,0 @@
# ALSA Sound Support
#
# We want to ensure that snd-seq is always loaded for those who want to use
# the sequencer interface, but we can't do this automatically through udev
# at the moment...so we have this rule (just for the moment).
#
# Remove the following line if you don't want the sequencer.
install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-seq

8
modprobe-dist-oss.conf
View File

@ -1,8 +0,0 @@
# OSS Sound Support
# This has been disabled in F11 onwards because it can interfere with the
# PulseAudio sound service (a legacy OSS application can prevent PulseAudio
# applications from playing sound by preventing PulseAudio from (re-)opening
# the sound device). To re-enable support, copy this file to
# the /etc/modprobe.d directory.
#
install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss && /sbin/modprobe snd-seq-device && /sbin/modprobe snd-seq-oss