remove useless information
Signed-off-by: SuperHugePan <zhangpan26@huawei.com>
This commit is contained in:
parent
06d283f950
commit
4060752591
@ -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)
|
|
||||||
@ -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
|
|
||||||
@ -7,12 +7,8 @@ License: LGPLv2+
|
|||||||
URL: https://alsa-project.org/
|
URL: https://alsa-project.org/
|
||||||
Source0: https://www.alsa-project.org/files/pub/lib/%{name}-%{version}.tar.bz2
|
Source0: https://www.alsa-project.org/files/pub/lib/%{name}-%{version}.tar.bz2
|
||||||
Source10: asound.conf
|
Source10: asound.conf
|
||||||
Source11: modprobe-dist-alsa.conf
|
|
||||||
Source12: modprobe-dist-oss.conf
|
|
||||||
|
|
||||||
Patch0: alsa-lib-1.0.24-config.patch
|
Patch0: alsa-lib-addon-dir.patch
|
||||||
Patch1: alsa-lib-1.0.14-glibc-open.patch
|
|
||||||
Patch2: alsa-lib-addon-dir.patch
|
|
||||||
|
|
||||||
BuildRequires: autoconf, automake, libtool, doxygen
|
BuildRequires: autoconf, automake, libtool, doxygen
|
||||||
Requires: coreutils
|
Requires: coreutils
|
||||||
@ -53,21 +49,12 @@ make install DESTDIR=%{buildroot}
|
|||||||
mkdir -p -m 755 %{buildroot}%{_sysconfdir}
|
mkdir -p -m 755 %{buildroot}%{_sysconfdir}
|
||||||
install -p -m 0644 %{SOURCE10} %{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
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc doc/asoundrc.txt
|
%doc doc/asoundrc.txt
|
||||||
%{_sysconfdir}/*.conf
|
%{_sysconfdir}/*.conf
|
||||||
%{_prefix}/lib/modprobe.d/*.conf
|
|
||||||
%{_defaultdocdir}/%{name}/*.conf
|
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_libdir}/libasound.so.*
|
%{_libdir}/libasound.so.*
|
||||||
%{_datadir}/alsa/*
|
%{_datadir}/alsa/*
|
||||||
@ -82,6 +69,9 @@ install -p -m 0644 %{SOURCE12} %{buildroot}%{_defaultdocdir}/%{name}/
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Thu Oct 24 2019 caomeng <caomeng5@huawei.com> - 1.1.6-5
|
||||||
- Type:NA
|
- Type:NA
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
@ -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
|
|
||||||
@ -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
|
|
||||||
Loading…
x
Reference in New Issue
Block a user