From 8f55604e86ce9f1f07a70c516dcb3e69db9e4586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Thu, 14 May 2020 13:19:09 +0100
Subject: [PATCH] Switch spice back to dsound instead of wasapi
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 ...tch-spice-glib-back-to-dsound-driver.patch | 52 +++++++++++++++++++
 msitools.spec                                 |  6 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 0011-wixl-switch-spice-glib-back-to-dsound-driver.patch

diff --git a/0011-wixl-switch-spice-glib-back-to-dsound-driver.patch b/0011-wixl-switch-spice-glib-back-to-dsound-driver.patch
new file mode 100644
index 0000000..619655d
--- /dev/null
+++ b/0011-wixl-switch-spice-glib-back-to-dsound-driver.patch
@@ -0,0 +1,52 @@
+From ab255b17d5d0bf08ada407738f567af3c7221a50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Wed, 13 May 2020 17:39:51 +0100
+Subject: [PATCH] wixl: switch spice-glib back to dsound driver
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The libgstwasapi.dll sink has bad interactions with spice causing it to
+stop playing audio after the first time the stream was opened and
+closed. Revert back to dsound driver until there is some solution that
+makes the wasapi driver reliable.
+
+Fixes https://gitlab.com/virt-viewer/virt-viewer/-/issues/2
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ data/wixl/spice-glib.wxi | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/data/wixl/spice-glib.wxi b/data/wixl/spice-glib.wxi
+index 8debe63..916e728 100644
+--- a/data/wixl/spice-glib.wxi
++++ b/data/wixl/spice-glib.wxi
+@@ -62,9 +62,13 @@
+           <Component Win64="$(var.Win64)" Id="cmp6E40650EE781D7A31FD8621801955090" Guid="*">
+               <File Id="fil5FE981BB233522C4A80C71349DDCDC94" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstautodetect.dll"/>
+           </Component>
+-
+           <Component Win64="$(var.Win64)" Id="cmpEE8AD0322820C368BE403D5588B6C5A3" Guid="*">
+-              <File Id="FIL887859C95D334F8EAF8A10FAEC6F7CE9" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstwasapi.dll"/>
++              <File Id="filA999BEB07C46CC2A776985F40270F7ED" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstdirectsound.dll"/>
++          </Component>
++
++          <!-- gstreamer1-plugins-bad-free -->
++          <Component Win64="$(var.Win64)" Id="cmp83B339398D5E5381DD1E992E16858015" Guid="*">
++              <File Id="filF556FED35C41B9063691FFEB1488F4EF" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstdirectsoundsrc.dll"/>
+           </Component>
+         </Directory>
+       </Directory> <!-- INSTALLDIR/lib -->
+@@ -122,6 +126,9 @@
+       <!-- from gstreamer1-plugins-good (lib) -->
+       <ComponentRef Id="cmp6E40650EE781D7A31FD8621801955090"/>
+       <ComponentRef Id="cmpEE8AD0322820C368BE403D5588B6C5A3"/>
++
++      <!-- from gstreamer1-plugins-bad-free (lib) -->
++      <ComponentRef Id="cmp83B339398D5E5381DD1E992E16858015"/>
+     </ComponentGroup>
+   </Fragment>
+ </Include>
+-- 
+2.26.2
+
diff --git a/msitools.spec b/msitools.spec
index 857903a..fbb7e5e 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -12,7 +12,7 @@
 
 Name:           msitools
 Version:        0.100
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Windows Installer tools
 
 License:        GPLv2+
@@ -32,6 +32,7 @@ Patch0009: 0009-Update-file-manifest-for-gstreamer1-plugins-bad-free.patch
 # Non-upstream patch to fix tarball missing the brotli.wxi file
 # Upstream fixed as side effect of the switch to meson.
 Patch0010: 0010-Add-brotli-files-missing-in-upstream-release-tarball.patch
+Patch0011: 0011-wixl-switch-spice-glib-back-to-dsound-driver.patch
 
 Requires:       libgsf >= 1.14.24-2
 
@@ -288,6 +289,9 @@ make -C data check-wxi
 
 
 %changelog
+* Thu May 14 2020 Daniel P. Berrangé <berrange@redhat.com> - 0.100-4
+- Switch spice back to dsound instead of wasapi
+
 * Thu Apr 23 2020 Daniel P. Berrangé <berrange@redhat.com> - 0.100-3
 - Re-enable wix validation
 - Fix bugs in multiple wxi manifests