rpms/alsa-lib/FC-4 alsa-lib-1.0.10-channel.patch, NONE, 1.1 alsa-lib.spec, 1.31, 1.32

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/alsa-lib/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29593

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.10-channel.patch 
Log Message:
export snd_pcm_channel_info() from library

alsa-lib-1.0.10-channel.patch:
 pcm_local.h |    5 +----
 pcm_mmap.c  |    5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE alsa-lib-1.0.10-channel.patch ---
--- alsa-lib-1.0.10/src/pcm/pcm_local.h.old	2005-09-02 18:36:40.000000000 +0200
+++ alsa-lib-1.0.10/src/pcm/pcm_local.h	2005-12-06 07:32:48.000000000 +0100
@@ -268,10 +268,7 @@
 				      snd_pcm_xfer_areas_func_t func);
 snd_pcm_sframes_t snd_pcm_read_mmap(snd_pcm_t *pcm, snd_pcm_uframes_t size);
 snd_pcm_sframes_t snd_pcm_write_mmap(snd_pcm_t *pcm, snd_pcm_uframes_t size);
-static inline int snd_pcm_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *info)
-{
-	return pcm->ops->channel_info(pcm, info);
-}
+int snd_pcm_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *info);
 int snd_pcm_channel_info_shm(snd_pcm_t *pcm, snd_pcm_channel_info_t *info, int shmid);
 int _snd_pcm_poll_descriptor(snd_pcm_t *pcm);
 int _snd_pcm_link_descriptors(snd_pcm_t *pcm, int *fds, int size, int (**failed)(snd_pcm_t *, int));
--- alsa-lib-1.0.10/src/pcm/pcm_mmap.c.old	2005-09-02 18:36:40.000000000 +0200
+++ alsa-lib-1.0.10/src/pcm/pcm_mmap.c	2005-05-23 11:04:15.000000000 +0200
@@ -262,6 +262,11 @@
 				  snd_pcm_mmap_read_areas);
 }
 
+int snd_pcm_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *info)
+{
+	return pcm->ops->channel_info(pcm, info);
+}
+
 int snd_pcm_channel_info_shm(snd_pcm_t *pcm, snd_pcm_channel_info_t *info, int shmid)
 {
 	switch (pcm->access) {


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/FC-4/alsa-lib.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- alsa-lib.spec	5 Dec 2005 06:58:46 -0000	1.31
+++ alsa-lib.spec	6 Dec 2005 06:52:13 -0000	1.32
@@ -4,12 +4,13 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_lib}%{?version_app}
-Release: 1.FC4
+Release: 2.FC4
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_lib}%{?prever}.tar.bz2
 Source1: ainit-%{version_ainit}.tar.gz
 Patch0:  alsa-lib-1.0.10-ainit.patch
+Patch1:  alsa-lib-1.0.10-channel.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: doxygen
@@ -38,6 +39,7 @@
 %prep
 %setup -q -n %{name}-%{version_lib}%{?prever} -a 1
 %patch0 -p1 -b .ainit
+%patch1 -p1 -b .chan
 
 %build
 %configure \
@@ -139,6 +141,10 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Tue Dec 06 2005 Martin Stransky <stransky at redhat.com> 1.0.10-2
+- export snd_pcm_channel_info() from library, 
+  it's needed for compatibility with 1.0.9
+
 * Mon Dec 05 2005 Martin Stransky <stransky at redhat.com> 1.0.10-1
 - update alsa-lib to 1.0.10 and ainit to 0.6
 - fixes in config files (for #166086)