rpms/openal-soft/F-10 upstream.patch, NONE, 1.1 openal-soft.spec, 1.2, 1.3

[Thomas Kowaliczek]

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv725/F-10

Modified Files:
	openal-soft.spec 
Added Files:
	upstream.patch 
Log Message:

- fixed some small bugs on my files


upstream.patch:
 alsa.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE upstream.patch ---
--- Alc/alsa.c	2009-05-26 23:54:15.000000000 +0200
+++ Alc/alsa.c	2009-08-16 11:09:57.000000000 +0200
@@ -537,7 +537,6 @@ static void alsa_close_playback(ALCdevic
 
 static ALCboolean alsa_open_capture(ALCdevice *pDevice, const ALCchar *deviceName, ALCuint frequency, ALCenum format, ALCsizei SampleSize)
 {
-    snd_pcm_format_t alsaFormat;
     snd_pcm_hw_params_t *p;
     snd_pcm_uframes_t bufferSizeInFrames;
     snd_pcm_access_t access;
@@ -598,13 +597,13 @@ open_alsa:
     switch(aluBytesFromFormat(format))
     {
         case 1:
-            alsaFormat = SND_PCM_FORMAT_U8;
+            data->format = SND_PCM_FORMAT_U8;
             break;
         case 2:
-            alsaFormat = SND_PCM_FORMAT_S16;
+            data->format = SND_PCM_FORMAT_S16;
             break;
         default:
-            alsaFormat = SND_PCM_FORMAT_UNKNOWN;
+            data->format = SND_PCM_FORMAT_UNKNOWN;
             AL_PRINT("Unknown format?! %x\n", format);
     }
 
@@ -652,7 +652,7 @@ open_alsa:
         if((i=psnd_pcm_hw_params_any(data->pcmHandle, p)) < 0)
             err = "any";
         /* set interleaved access */
-        if(err == NULL && (i=psnd_pcm_hw_params_set_access(data->pcmHandle, p, SND_PCM_ACCESS_MMAP_INTERLEAVED)) < 0)
+        if(err == NULL && (i=psnd_pcm_hw_params_set_access(data->pcmHandle, p, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
             err = "set access";
         /* set format (implicitly sets sample bits) */
         if(err == NULL && (i=psnd_pcm_hw_params_set_format(data->pcmHandle, p, data->format)) < 0)


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-10/openal-soft.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openal-soft.spec	16 Aug 2009 11:24:45 -0000	1.2
+++ openal-soft.spec	16 Aug 2009 11:44:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		openal-soft
 Version:	1.8.466
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
@@ -8,6 +8,7 @@ License:	LGPLv2+
 URL:		http://kcat.strangesoft.net/openal.html
 Source0:	http://kcat.strangesoft.net/openal-releases/openal-soft-%{version}.tar.bz2
 Patch1:		openal-soft.patch
+Patch2:		upstream.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -30,8 +31,7 @@ and audio capture.
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes: 	openal-devel <= 0.0.10
-Provides: 	openal-devel = %{version}
+Conflicts: 	openal-devel
 
 %description	devel
 The %{name}-devel package contains libraries and header files for
@@ -40,6 +40,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch1 -p0 -b .orig
+%patch2 -p0 -b .orig
 
 %build
 %cmake .
@@ -70,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Sun Aug 16 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-7
+- Fixed bug 517721. Added upstream.patch
+
 * Sat Aug 08 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-6
 - Fixed license and pkgconfig problem thx goes to Christoph Wickert