[SCM] Emulator of the Super Nintendo Entertainment System (TM) branch, master, updated. debian/1.510+bz2-3-10-gb504edb

[Etienne Millon]

The following commit has been merged in the master branch:
commit 9d82036ff3b5905667a1c77223d27f9eb3289410
Author: Etienne Millon <me at emillon.org>
Date:   Mon Jul 2 21:07:06 2012 +0200

    Pick patch for #679826

diff --git a/debian/changelog b/debian/changelog
index 1cab709..a0abf6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ zsnes (1.510+bz2-4) UNRELEASED; urgency=low
 
   * Disable build on amd64 (Closes: #679526, #672935)
     - Add Multi-Arch: Foreign
+  * Add patch to initialize the ao_sample_format structure
+    (thanks to Fabian Greffrath - Closes: #679826)
   * debian/compat : use level 9 compatibility level
   * debian/rules :
     - use find -delete instead of shell globbing
diff --git a/debian/patches/0014-Initialize-driver_format.matrix-with-NULL.patch b/debian/patches/0014-Initialize-driver_format.matrix-with-NULL.patch
new file mode 100644
index 0000000..6865f1f
--- /dev/null
+++ b/debian/patches/0014-Initialize-driver_format.matrix-with-NULL.patch
@@ -0,0 +1,21 @@
+From: Fabian Greffrath <fabian+debian at greffrath.com>
+Date: Mon, 2 Jul 2012 11:15:52 +0200
+Subject: Initialize driver_format.matrix with NULL;
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679826
+---
+ src/linux/audio.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/linux/audio.c b/src/linux/audio.c
+index 985855c..bebf159 100644
+--- a/src/linux/audio.c
++++ b/src/linux/audio.c
+@@ -170,6 +170,7 @@ static int SoundInit_ao()
+   driver_format.channels = StereoSound+1;
+   driver_format.rate = freqtab[SoundQuality = ((SoundQuality > 6) ? 1 : SoundQuality)];
+   driver_format.byte_format = AO_FMT_LITTLE;
++  driver_format.matrix = NULL;
+ 
+   if (audio_device)
+   {
diff --git a/debian/patches/series b/debian/patches/series
index 3a71686..3d70a56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0011-Don-t-strip-binaries-upstream.patch
 0012-Fix-build-with-gcc-4.7.patch
 0013-Fix-sound-with-libao.patch
+0014-Initialize-driver_format.matrix-with-NULL.patch

-- 
Emulator of the Super Nintendo Entertainment System (TM)