Package init
This commit is contained in:
dogsheng
parent
01346f91bc
commit
c629a9ad6d
@ -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
|
|
||||||
Binary file not shown.
@ -1,85 +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 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
|
|
||||||
|
|
||||||
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 ef2ea9c1..2b46f95c 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 c91661e9..00000000
|
|
||||||
--- 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 99978848..00000000
|
|
||||||
--- 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,92 +0,0 @@
|
|||||||
Name: alsa-lib
|
|
||||||
Version: 1.1.6
|
|
||||||
Release: 5
|
|
||||||
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
|
|
||||||
|
|
||||||
BuildRequires: autoconf, automake, libtool, doxygen
|
|
||||||
Requires: coreutils
|
|
||||||
|
|
||||||
%description
|
|
||||||
The alsa-lib is a library to interface with ALSA in the Linux kernel
|
|
||||||
and virtual devices using a plugin system.
|
|
||||||
More detail: https://alsa.opensrc.org/Alsa-lib
|
|
||||||
|
|
||||||
%package devel
|
|
||||||
Summary: Development header files
|
|
||||||
Requires: %{name} = %{version}
|
|
||||||
Requires: pkgconfig
|
|
||||||
Provides: %{name}-devel = %{version}
|
|
||||||
Provides: pkgconfig(alsa)
|
|
||||||
|
|
||||||
%description devel
|
|
||||||
This package contains libraries and header files for the ALSA development.
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%autosetup -n %{name}-%{version} -p1
|
|
||||||
|
|
||||||
%build
|
|
||||||
autoreconf -vif
|
|
||||||
%configure --disable-aload \
|
|
||||||
--with-plugindir=%{_libdir}/alsa-lib \
|
|
||||||
--disable-alisp
|
|
||||||
|
|
||||||
%disable_rpath
|
|
||||||
|
|
||||||
make %{?_smp_mflags} VERBOSE=1
|
|
||||||
make doc %{?_smp_mflags}
|
|
||||||
|
|
||||||
%install
|
|
||||||
make install DESTDIR=%{buildroot}
|
|
||||||
|
|
||||||
# the asound.conf configuration files are required for ALSA to work properly
|
|
||||||
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/*
|
|
||||||
|
|
||||||
%files devel
|
|
||||||
%doc doc/doxygen/ TODO
|
|
||||||
%{_libdir}/libasound.so
|
|
||||||
%exclude %{_libdir}/libasound.la
|
|
||||||
%{_libdir}/pkgconfig/*.pc
|
|
||||||
%{_includedir}/*
|
|
||||||
%{_datadir}/aclocal/*.m4
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Thu Oct 24 2019 caomeng <caomeng5@huawei.com> - 1.1.6-5
|
|
||||||
- Type:NA
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:delete build requirement alsa-utils
|
|
||||||
|
|
||||||
* Mon Aug 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.6-4
|
|
||||||
- Package init
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
#
|
|
||||||
# Place your global alsa-lib configuration here...
|
|
||||||
#
|
|
||||||
@ -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