From f6767a52b35ff4973e8fd6f41a95c1821bad67c7 Mon Sep 17 00:00:00 2001
From: perex <perex@fedoraproject.org>
Date: Wed, 10 Sep 2008 13:42:34 +0000
Subject: [PATCH] alsa-lib: updated to 1.0.18rc3 and new configuration style

---
 .cvsignore                   |  1 +
 alsa-lib-pulse-default.patch | 10 ----------
 alsa-lib.spec                | 31 +++++++++++++++++++++----------
 alsactl.conf                 | 14 ++++++++++++++
 asound.conf                  | 13 +++++++++++++
 sources                      |  2 +-
 6 files changed, 50 insertions(+), 21 deletions(-)
 delete mode 100644 alsa-lib-pulse-default.patch
 create mode 100644 alsactl.conf
 create mode 100644 asound.conf

diff --git a/.cvsignore b/.cvsignore
index 053dbda..7cbd550 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -20,3 +20,4 @@ alsa-lib-1.0.15rc3.tar.bz2
 alsa-lib-1.0.16.tar.bz2
 alsa-lib-1.0.17.tar.bz2
 alsa-lib-1.0.17a.tar.bz2
+alsa-lib-1.0.18rc3.tar.bz2
diff --git a/alsa-lib-pulse-default.patch b/alsa-lib-pulse-default.patch
deleted file mode 100644
index 7882b93..0000000
--- a/alsa-lib-pulse-default.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 91deb66..350e712 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -1,17 +1,18 @@
-#define  prever         rc3
-#define  prever_dot     .rc3
-%define postver		a
+%define  prever         rc3
+%define  prever_dot     .rc3
+#define postver		a
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
-Version: 1.0.17
+Version: 1.0.18
 Release: 3%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
+Source10: asound.conf
+Source11: alsactl.conf
 Patch0:  alsa-lib-1.0.17-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
-Patch3:	 alsa-lib-pulse-default.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -43,11 +44,10 @@ against the ALSA libraries and interfaces.
 %setup -q -n %{name}-%{version}%{?prever}%{?postver}
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
-%patch3 -p1 -b .pulse-default
 %patch4 -p1 -b .no-dox-date
 
 %build
-%configure --with-configdir=%{_sysconfdir}/alsa
+%configure --disable-aload
 # Remove useless /usr/lib64 rpath on 64bit archs
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -63,6 +63,11 @@ mkdir -p %{buildroot}/%{_lib}
 mv %{buildroot}%{_libdir}/libasound.so.* %{buildroot}/%{_lib}
 ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
 
+# Install global configuration files
+mkdir -p -m 755 $RPM_BUILD_ROOT/etc/alsa
+install -p -m 644 %{SOURCE10} %{buildroot}/etc
+install -p -m 644 %{SOURCE11} %{buildroot}/etc/alsa
+
 %clean
 rm -rf %{buildroot}
 
@@ -70,16 +75,15 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%triggerpostun -- alsa-lib < 1.0.6-2
-ln -snf ../../etc/alsa %{_datadir}/alsa
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog TODO doc/asoundrc.txt
 %config %{_sysconfdir}/alsa/
+%config %{_sysconfdir}/asound.conf
 /%{_lib}/libasound.so.*
 %{_bindir}/aserver
 %{_libdir}/alsa-lib/
+%(_datadir)/alsa/
 
 %files devel
 %defattr(-,root,root,-)
@@ -92,6 +96,13 @@ ln -snf ../../etc/alsa %{_datadir}/alsa
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep 10 2008 Jaroslav Kysela <jkysela@redhat.com> - 1.0.18-1.rc3
+- updated to 1.0.18rc3
+- moved /etc/alsa configuration files back to /usr/share/alsa
+- removed pulse default patch (moved to /etc/asound.conf)
+- added /etc/asound.conf and /etc/alsa/alsactl.conf
+- disable /dev/aload device checking (obsolete for 2.6 kernels)
+
 * Fri Aug 15 2008 Jaroslav Kysela <jkysela@redhat.com> - 1.0.17-3
 - updated to 1.0.17a
 
diff --git a/alsactl.conf b/alsactl.conf
new file mode 100644
index 0000000..71f0d80
--- /dev/null
+++ b/alsactl.conf
@@ -0,0 +1,14 @@
+#
+# ALSA library configuration file for alsactl tool
+# (/usr/share/alsa tree is not necessary for alsactl)
+#
+
+ctl.hw {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+		default "0"
+	}
+	type hw
+	card $CARD
+}
diff --git a/asound.conf b/asound.conf
new file mode 100644
index 0000000..9b1d6ea
--- /dev/null
+++ b/asound.conf
@@ -0,0 +1,13 @@
+#
+# Place your global alsa-lib configuration here...
+#
+
+@hooks [
+	{
+		func load
+		files [
+			"/etc/alsa/pulse-default.conf"
+		]
+		errors false
+	}
+]
diff --git a/sources b/sources
index 60a77c1..eb336da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4284535ff10f5e71152f8f69b325d08d  alsa-lib-1.0.17a.tar.bz2
+748b7ac75102b9b4523827b81e4c1f00  alsa-lib-1.0.18rc3.tar.bz2