From 98ab7304607ff9a7aaf848aec3327fcfba5add17 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@fedoraproject.org>
Date: Sep 04 2009 10:38:39 +0000
Subject: - Make pulseaudio the default audio backend (#519540, #495964, #496627)


---

diff --git a/qemu-allow-pulseaudio-to-be-the-default.patch b/qemu-allow-pulseaudio-to-be-the-default.patch
new file mode 100644
index 0000000..27c9058
--- /dev/null
+++ b/qemu-allow-pulseaudio-to-be-the-default.patch
@@ -0,0 +1,37 @@
+From a9459944fec8e338826eedbce844ce5c1c1ff948 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Fri, 4 Sep 2009 11:24:03 +0100
+Subject: [PATCH] Allow pulseaudio backend to be the default
+
+We're seeing various issues with the SDL audio backend and want to
+switch to the pulseaudio backend. See e.g.
+
+  https://bugzilla.redhat.com/495964
+  https://bugzilla.redhat.com/519540
+  https://bugzilla.redhat.com/496627
+
+The pulseaudio backend seems to work well, so we should allow it to be
+selected as the default.
+
+Signed-off-by: Mark McLoughlin <markmc@redhat.com>
+Fedora-patch: qemu-allow-pulseaudio-to-be-the-default.patch
+---
+ audio/paaudio.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/audio/paaudio.c b/audio/paaudio.c
+index ff43bdd..081087a 100644
+--- a/audio/paaudio.c
++++ b/audio/paaudio.c
+@@ -507,7 +507,7 @@ struct audio_driver pa_audio_driver = {
+     INIT_FIELD (init           = ) qpa_audio_init,
+     INIT_FIELD (fini           = ) qpa_audio_fini,
+     INIT_FIELD (pcm_ops        = ) &qpa_pcm_ops,
+-    INIT_FIELD (can_be_default = ) 0,
++    INIT_FIELD (can_be_default = ) 1,
+     INIT_FIELD (max_voices_out = ) INT_MAX,
+     INIT_FIELD (max_voices_in  = ) INT_MAX,
+     INIT_FIELD (voice_size_out = ) sizeof (PAVoiceOut),
+-- 
+1.6.2.5
+
diff --git a/qemu.spec b/qemu.spec
index 97a8c76..4c47d44 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -30,6 +30,7 @@ Patch14: qemu-kvm-fix-kerneldir-includes.patch
 Patch15: qemu-avoid-harmless-msr-warnings.patch
 Patch16: qemu-ppc-on-ppc.patch
 Patch17: qemu-use-statfs-to-determine-huge-page-size.patch
+Patch18: qemu-allow-pulseaudio-to-be-the-default.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -227,6 +228,7 @@ such as kvmtrace and kvm_stat.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -469,6 +471,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Sep  4 2009 Mark McLoughlin <markmc@redhat.com> - 2:0.10.6-4
+- Make pulseaudio the default audio backend (#519540, #495964, #496627)
+
 * Fri Sep  4 2009 Mark McLoughlin <markmc@redhat.com> - 2:0.10.6-3
 - Use statfs to determine huge page size, fixing fd leak (#519378)