Compare commits
7 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
046113b0a8 | ||
|
|
03e9ab8100 | ||
|
f9ae32497a | ||
|
|
dafb0030d6 | ||
|
|
1f69500496 | ||
|
|
5cb01a1e36 | ||
|
|
fff35f5bf0 |
5 changed files with 60 additions and 110 deletions
0
alsa-git.patch
Normal file
0
alsa-git.patch
Normal file
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
|
||||
index 1889f01..60c12ac 100644
|
||||
index 09980586..c4525f0b 100644
|
||||
--- a/src/conf/alsa.conf
|
||||
+++ b/src/conf/alsa.conf
|
||||
@@ -66,8 +66,7 @@ defaults.pcm.nonblock 1
|
||||
@@ -67,8 +67,7 @@ defaults.pcm.nonblock 1
|
||||
defaults.pcm.compat 0
|
||||
defaults.pcm.minperiodtime 5000 # in us
|
||||
defaults.pcm.ipc_key 5678293
|
||||
|
|
@ -10,13 +10,13 @@ index 1889f01..60c12ac 100644
|
|||
-defaults.pcm.ipc_perm 0660
|
||||
+defaults.pcm.ipc_perm 0600
|
||||
defaults.pcm.dmix.max_periods 0
|
||||
defaults.pcm.dmix.channels 2
|
||||
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
|
||||
index 7fa5c8b2..97936a82 100644
|
||||
--- a/src/conf/pcm/dmix.conf
|
||||
+++ b/src/conf/pcm/dmix.conf
|
||||
@@ -41,10 +41,6 @@ pcm.!dmix {
|
||||
@@ -48,10 +48,6 @@ pcm.!dmix {
|
||||
@func refer
|
||||
name defaults.pcm.ipc_key
|
||||
}
|
||||
|
|
@ -28,7 +28,7 @@ index e62cb29..a005488 100644
|
|||
@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
|
||||
index abbd44f7..528fb6ad 100644
|
||||
--- a/src/conf/pcm/dsnoop.conf
|
||||
+++ b/src/conf/pcm/dsnoop.conf
|
||||
@@ -41,10 +41,6 @@ pcm.!dsnoop {
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
Summary: The Advanced Linux Sound Architecture (ALSA) library
|
||||
Name: alsa-lib
|
||||
Version: 1.1.6
|
||||
Release: 3%{?prever_dot}%{?dist}
|
||||
Version: 1.1.9
|
||||
Release: 1%{?prever_dot}%{?dist}
|
||||
License: LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.alsa-project.org/
|
||||
|
|
@ -14,9 +14,9 @@ Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?post
|
|||
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
|
||||
Patch10: alsa-lib-addon-dir.patch
|
||||
#Patch0: alsa-git.patch
|
||||
Patch1: alsa-lib-1.1.9-config.patch
|
||||
Patch2: alsa-lib-1.0.14-glibc-open.patch
|
||||
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: autoconf automake libtool
|
||||
|
|
@ -44,19 +44,30 @@ This package includes the ALSA development libraries for developing
|
|||
against the ALSA libraries and interfaces.
|
||||
|
||||
%package -n alsa-ucm
|
||||
Summary: ALSA Universal Configuration Manager
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Summary: ALSA Use Case Manager configuration
|
||||
Group: System Environment/Libraries
|
||||
BuildArch: noarch
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description -n alsa-ucm
|
||||
The Advanced Linux Sound Architecture (ALSA) Universal Configuration
|
||||
Manager allows configuration of Audio input/output names and routing
|
||||
The Advanced Linux Sound Architecture (ALSA) Use Case Manager configuration
|
||||
contains alsa-lib configuration of Audio input/output names and routing
|
||||
|
||||
%package -n alsa-topology
|
||||
Summary: ALSA Topology configuration
|
||||
Group: System Environment/Libraries
|
||||
BuildArch: noarch
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description -n alsa-topology
|
||||
The Advanced Linux Sound Architecture (ALSA) topology configuration
|
||||
contains alsa-lib configuration of SoC topology
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{?prever}%{?postver}
|
||||
%patch0 -p1 -b .config
|
||||
%patch1 -p1 -b .glibc-open
|
||||
%patch10 -p1 -b .addon-dir
|
||||
#%patch0 -p1 -b .alsa-git
|
||||
%patch1 -p1 -b .config
|
||||
%patch2 -p1 -b .glibc-open
|
||||
|
||||
%build
|
||||
autoreconf -vif
|
||||
|
|
@ -70,6 +81,8 @@ make %{?_smp_mflags} V=1
|
|||
make doc
|
||||
|
||||
%install
|
||||
%global sysmodprobedir %{_prefix}/lib/modprobe.d
|
||||
|
||||
make DESTDIR=%{buildroot} install
|
||||
|
||||
# We need the library to be available even before /usr might be mounted
|
||||
|
|
@ -82,17 +95,23 @@ mkdir -p -m 755 %{buildroot}/etc
|
|||
install -p -m 644 %{SOURCE10} %{buildroot}/etc
|
||||
|
||||
# Install the modprobe files for ALSA
|
||||
mkdir -p -m 755 %{buildroot}/lib/modprobe.d/
|
||||
install -p -m 644 %{SOURCE11} %{buildroot}/lib/modprobe.d/dist-alsa.conf
|
||||
mkdir -p -m 755 %{buildroot}%{sysmodprobedir}
|
||||
install -p -m 644 %{SOURCE11} %{buildroot}%{sysmodprobedir}/dist-alsa.conf
|
||||
# bug#926973, place this file to the doc directory
|
||||
install -p -m 644 %{SOURCE12} .
|
||||
|
||||
# Create UCM directory
|
||||
mkdir -p %{buildroot}/%{_datadir}/alsa/ucm
|
||||
|
||||
#Remove libtool archives.
|
||||
# Create topology directory
|
||||
mkdir -p %{buildroot}/%{_datadir}/alsa/topology
|
||||
|
||||
# Remove libtool archives.
|
||||
find %{buildroot} -name '*.la' -delete
|
||||
|
||||
# Remove /usr/include/asoundlib.h
|
||||
rm %{buildroot}/%{_includedir}/asoundlib.h
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
|
@ -107,7 +126,8 @@ find %{buildroot} -name '*.la' -delete
|
|||
#{_libdir}/alsa-lib/
|
||||
%{_datadir}/alsa/
|
||||
%exclude %{_datadir}/alsa/ucm
|
||||
/lib/modprobe.d/dist-*
|
||||
%exclude %{_datadir}/alsa/topology
|
||||
%{sysmodprobedir}/dist-*
|
||||
|
||||
%files devel
|
||||
%doc TODO doc/doxygen/
|
||||
|
|
@ -120,7 +140,23 @@ find %{buildroot} -name '*.la' -delete
|
|||
%files -n alsa-ucm
|
||||
%{_datadir}/alsa/ucm
|
||||
|
||||
%files -n alsa-topology
|
||||
%{_datadir}/alsa/topology
|
||||
|
||||
%changelog
|
||||
* Fri May 10 2019 Jaroslav Kysela <perex@perex.cz> - 1.1.9-1
|
||||
- Updated to 1.1.9
|
||||
|
||||
* Mon Jan 7 2019 Jaroslav Kysela <perex@perex.cz> - 1.1.8-1
|
||||
- Updated to 1.1.8
|
||||
|
||||
* Tue Dec 25 2018 Hans de Goede <hdegoede@redhat.com> - 1.1.7-3
|
||||
- Fix broken chtrt5645 UCM profile, fixing mic input on chtrt5645 devices
|
||||
|
||||
* Wed Oct 24 2018 Jaroslav Kysela <perex@perex.cz> - 1.1.7-2
|
||||
- Moved topology files to alsa-topology
|
||||
- Updated to 1.1.7
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
3
sources
3
sources
|
|
@ -1,2 +1 @@
|
|||
SHA512 (alsa-lib-1.1.5.tar.bz2) = c79ceaa1ebfeda2caf41a0495ea31dd2748a11795989aebc341ae13a5c96d21495e4542571d5590e68b2575ceddd6e84059a950ddb78e6c0b9d94861faee4f58
|
||||
SHA512 (alsa-lib-1.1.6.tar.bz2) = 00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0
|
||||
SHA512 (alsa-lib-1.1.9.tar.bz2) = 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue