Author: musuruan Update of /cvs/free/rpms/zsnes/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv30956 Modified Files: zsnes.spec Added Files: zsnes-1.51-pulseaudio.patch Log Message: * Wed Dec 24 2008 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.51-5 - used an upstream patch to fix pulseaudio zsnes-1.51-pulseaudio.patch: --- NEW FILE zsnes-1.51-pulseaudio.patch --- diff -dur zsnes_1_51/src/linux/audio.c zsnes_1_51.pulse/src/linux/audio.c --- zsnes_1_51/src/linux/audio.c 2007-01-10 02:19:12.000000000 +0100 +++ zsnes_1_51.pulse/src/linux/audio.c 2008-12-24 16:58:39.000000000 +0100 @@ -33,8 +33,8 @@ #ifdef __LIBAO__ static pthread_t audio_thread; -static pthread_mutex_t audio_mutex; -static pthread_cond_t audio_wait; +static pthread_mutex_t audio_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t audio_wait = PTHREAD_COND_INITIALIZER; static ao_device *audio_device = 0; static volatile unsigned int samples_waiting = 0; #endif @@ -181,14 +181,6 @@ { puts("pthread_create() failed."); } - else if (pthread_mutex_init(&audio_mutex, 0)) - { - puts("pthread_mutex_init() failed."); - } - else if (pthread_cond_init(&audio_wait, 0)) - { - puts("pthread_cond_init() failed."); - } InitSampleControl(); } Index: zsnes.spec =================================================================== RCS file: /cvs/free/rpms/zsnes/devel/zsnes.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- zsnes.spec 30 Jul 2008 05:23:49 -0000 1.3 +++ zsnes.spec 26 Dec 2008 13:59:07 -0000 1.4 @@ -4,7 +4,7 @@ Summary: ZSNES is a Super Nintendo emulator Name: zsnes Version: 1.51 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/Emulators URL: http://www.zsnes.com/ @@ -15,6 +15,8 @@ Patch2: zsnes-1.51-FORTIFY_SOURCE.patch # Paul Bender (minimyth) Patch3: zsnes-1.51-gcc43.patch +# Upstream CVS +Patch4: zsnes-1.51-pulseaudio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # This is to build only for i386 on plague #ExclusiveArch: %{ix86} @@ -42,6 +44,7 @@ %patch1 -p2 %patch2 -p2 %patch3 -p2 +%patch4 -p2 # Remove hardcoded CFLAGS and LDFLAGS sed -i \ @@ -120,6 +123,9 @@ %doc ../docs/readme.htm/ ../docs/readme.txt/ %changelog +* Wed Dec 24 2008 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.51-5 +- used an upstream patch to fix pulseaudio + * Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.51-4 - rebuild for buildsys cflags issue