From 2204a689a3cd4842af7c36c33a9dccd13d9395ff Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Oct 17 2007 23:00:08 +0000 Subject: Add hook to /etc/alsa/alsa.conf so that /etc/alsa/default-pulse.conf is loaded when it exists. This allows us to enable the pulse plugin by default depending on whether it is installed or not. --- diff --git a/alsa-lib-pulse-default.patch b/alsa-lib-pulse-default.patch new file mode 100644 index 0000000..7882b93 --- /dev/null +++ b/alsa-lib-pulse-default.patch @@ -0,0 +1,10 @@ +--- alsa-lib-1.0.15rc3.lennart/src/conf/alsa.conf 2007-10-17 18:28:03.000000000 -0400 ++++ alsa-lib-1.0.15rc3/src/conf/alsa.conf 2007-10-17 18:33:10.000000000 -0400 +@@ -8,6 +8,7 @@ + { + func load + files [ ++ "/etc/alsa/pulse-default.conf" + "/etc/asound.conf" + "~/.asoundrc" + ] diff --git a/alsa-lib.spec b/alsa-lib.spec index 68b284b..ccdf3eb 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -4,12 +4,13 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: 1.0.15 -Release: 0.3%{?prever_dot}%{?dist} +Release: 0.4%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2 Patch0: alsa-lib-1.0.14rc1-config.patch Patch2: alsa-lib-1.0.14-glibc-open.patch +Patch3: alsa-lib-pulse-default.patch URL: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: doxygen @@ -40,6 +41,7 @@ against the ALSA libraries and interfaces. %setup -q -n %{name}-%{version}%{?prever} %patch0 -p1 -b .config %patch2 -p1 -b .glibc-open +%patch3 -p1 -b .pulse-default %build %configure --with-configdir=%{_sysconfdir}/alsa @@ -87,6 +89,11 @@ ln -snf ../../etc/alsa %{_datadir}/alsa %{_datadir}/aclocal/alsa.m4 %changelog +* Wed Oct 17 2007 Lennart Poettering 1.0.15-0.3.rc3 +- Add hook to /etc/alsa/alsa.conf so that /etc/alsa/default-pulse.conf + is loaded when it exists. This allows us to enable the pulse plugin by + default depending on whether it is installed or not. + * Mon Oct 15 2007 Martin Stransky 1.0.15-0.3.rc3 - updated to 1.0.15rc3