The following commit has been merged in the fortify branch:
commit ffbea172396088852e1b8cb0daaee5fe1b399710
Author: Fabian Greffrath <[email protected]>
Date: Wed Jul 18 10:43:02 2012 +0200
0013-Fix-sound-with-libao.patch: Replace with actual patch from upstream
SVN.
diff --git a/debian/patches/0013-Fix-sound-with-libao.patch
b/debian/patches/0013-Fix-sound-with-libao.patch
index eef95e2..a217177 100644
--- a/debian/patches/0013-Fix-sound-with-libao.patch
+++ b/debian/patches/0013-Fix-sound-with-libao.patch
@@ -9,31 +9,31 @@ Bug-Debian:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=470410
src/linux/audio.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
-diff --git a/src/linux/audio.c b/src/linux/audio.c
-index d31f6bf..985855c 100644
--- a/src/linux/audio.c
+++ b/src/linux/audio.c
-@@ -177,11 +177,7 @@ static int SoundInit_ao()
- }
- else
- {
-- if (pthread_create(&audio_thread, 0, SoundThread_ao, 0))
-- {
-- puts("pthread_create() failed.");
-- }
-- else if (pthread_mutex_init(&audio_mutex, 0))
-+ if (pthread_mutex_init(&audio_mutex, 0))
- {
- puts("pthread_mutex_init() failed.");
- }
-@@ -189,6 +185,10 @@ static int SoundInit_ao()
+@@ -33,8 +33,8 @@ Foundation, Inc., 675 Mass Ave, Cambridg
+
+ #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 @@ static int SoundInit_ao()
{
- puts("pthread_cond_init() failed.");
+ puts("pthread_create() failed.");
}
-+ else if (pthread_create(&audio_thread, 0, SoundThread_ao, 0))
-+ {
-+ 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();
}
--
Emulator of the Super Nintendo Entertainment System (TM)
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
