From 9c32a2b44bce00d7894fa4bf81b80ed14debe5e0 Mon Sep 17 00:00:00 2001
From: Victor Toso <victortoso@redhat.com>
Date: Tue, 4 Nov 2014 18:13:47 +0100
Subject: wxi: update spice-glib.wxi to use gstreamer1

https://bugzilla.gnome.org/show_bug.cgi?id=740809
---
 data/wixl/spice-glib.wxi | 110 ++++++++++++++++++++++++++---------------------
 1 file changed, 62 insertions(+), 48 deletions(-)

(limited to 'data')

diff --git a/data/wixl/spice-glib.wxi b/data/wixl/spice-glib.wxi
index 69c1bce..6c921ff 100644
--- a/data/wixl/spice-glib.wxi
+++ b/data/wixl/spice-glib.wxi
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?require usbredir.wxi?>
-<?require gstreamer.wxi?>
+<?require gstreamer1.wxi?>
 <?require openssl.wxi?>
 <?require pixman.wxi?>
 <?require libjpeg-turbo.wxi?>
@@ -11,6 +11,7 @@
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
       <Directory Id="dir775DA6245305AB2120C733A9480577AA" Name="bin">
+        <!-- from spice -->
         <Component Win64="$(var.Win64)" Id="cmp102591AAF331792A897FB24554275832" Guid="*">
           <File Id="fil35FAB81A77DA2E800C66E4D946F97031" KeyPath="yes" Source="$(var.SourceDir)/bin/libspice-client-glib-2.0-8.dll"/>
         </Component>
@@ -19,53 +20,57 @@
         </Component>
 
         <!-- gst-plugins-base -->
-        <Component Win64="$(var.Win64)" Id="cmp4A56F2FEAA3A575F3561BD6E960B6B47" Guid="*">
-          <File Id="fil60CEAFA762E3AB07FF6EC739BEB587FB" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstapp-0.10-0.dll"/>
+        <Component Win64="$(var.Win64)" Id="cmp41BC989F8EA49BB2E49028C69193B3BB" Guid="*">
+          <File Id="filFD666980B9231A8B42A54DADFBFA9F60" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstapp-1.0-0.dll"/>
         </Component>
-        <Component Win64="$(var.Win64)" Id="cmp692250298EA7C7B39477952B28CF34CF" Guid="*">
-          <File Id="fil20A96479CCB28BE5A94C376458E3BB67" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstpbutils-0.10-0.dll"/>
+        <Component Win64="$(var.Win64)" Id="cmpD6B03E1492CA64AF46E4C18AEFBDC51E" Guid="*">
+          <File Id="filEC0A5007844622724D7027329E9D7948" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstpbutils-1.0-0.dll"/>
         </Component>
-        <Component Win64="$(var.Win64)" Id="cmp18ED35739242986000DC9D69D40BC8BC" Guid="*">
-          <File Id="fil73C0890E2997DE8152078F436FCAE6A1" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstaudio-0.10-0.dll"/>
+        <Component Win64="$(var.Win64)" Id="cmp97F799D2F039ED8AE681FF26DAA62BC6" Guid="*">
+          <File Id="filB8EF93AEF72F98A5FAEE1C5B378E802E" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstaudio-1.0-0.dll"/>
         </Component>
-        <Component Win64="$(var.Win64)" Id="cmpF62FD2E4C8B2A5D7B1A253E0A362547A" Guid="*">
-          <File Id="fil0428CA794533DA28023C7BB25A833F0D" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstfft-0.10-0.dll"/>
+        <Component Win64="$(var.Win64)" Id="cmpB7CAC9DC9890205AE57AE38AA3EAA3B5" Guid="*">
+          <File Id="fil1B156259DAFA2BFA8D5457D453976DEF" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstfft-1.0-0.dll"/>
         </Component>
-        <Component Win64="$(var.Win64)" Id="cmp60C1666B2D158B51EF557B7AC0CBFD17" Guid="*">
-          <File Id="fil8F44D4A88DCAED76FF48B6B918C712AE" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstinterfaces-0.10-0.dll"/>
+        <Component Win64="$(var.Win64)" Id="cmp93FAE555B2F925E239C97B777E49DB05" Guid="*">
+          <File Id="fil99891F7CDB47EF478CE6AD8F7FE84996" KeyPath="yes" Source="$(var.SourceDir)/bin/libgsttag-1.0-0.dll"/>
         </Component>
 
-      </Directory>
+        <!-- gst-plugins-good -->
+      </Directory> <!-- INSTALLDIR/bin -->
 
       <!-- some gst plugins -->
-      <Directory Id="dirBC17AF922D3411ED4A9D4C99935C17A5" Name="lib">
-        <Directory Id="dir4607888FD87E10C13B6C7B6A267E34C8" Name="gstreamer-0.10">
-          <Component Win64="$(var.Win64)" Id="cmpF37CEFDBBF229DA58F7F7CB5184FF340" Guid="*">
-            <File Id="filB3CFDD94EFC066BCD24E922EDD11D48E" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-0.10/libgstcoreelements.dll"/>
-          </Component>
-          <Component Win64="$(var.Win64)" Id="cmpD7CA28D01407886511D335391289C0F2" Guid="*">
-            <File Id="fil0C50E69E6D444FBA9BCCF651326EF18B" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-0.10/libgstapp.dll"/>
+      <Directory Id="dir45FBFBFBF0507CF556F16E5D55A6D6B4" Name="lib">
+        <Directory Id="dirB633496AD20397948EE1B7DFC5EFA997" Name="gstreamer-1.0">
+
+          <!-- from gstreamer1-plugins-base -->
+          <Component Win64="$(var.Win64)" Id="cmpDBE70B8247EC74A22BC700164134F68A" Guid="*">
+            <File Id="filB3E23AED2A7A3998F0AAD03425B5CC68" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstaudioconvert.dll"/>
           </Component>
-          <Component Win64="$(var.Win64)" Id="cmp30AFF452AB17BA179E4CF4E3AEB06266" Guid="*">
-            <File Id="fil628CF80A245D1633C3485F3C2A09AEC1" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-0.10/libgstaudioconvert.dll"/>
+          <Component Win64="$(var.Win64)" Id="cmp4B0C983D765E7C44897E9143F454A027" Guid="*">
+            <File Id="filEE3A7FD73839F0546EC7E3C5CA72D7CF" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstaudiorate.dll"/>
           </Component>
-          <Component Win64="$(var.Win64)" Id="cmp32FD27BDAAA418E095B90F4713482B31" Guid="*">
-            <File Id="filAAF73B550FCA9164EABA33662F62E907" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-0.10/libgstaudiorate.dll"/>
+          <Component Win64="$(var.Win64)" Id="cmp8F07634CD23193CA1415D2F0F473FDC3" Guid="*">
+            <File Id="fil48259A14A00CE6800B6C3D390E3D7FB1" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstaudioresample.dll"/>
           </Component>
-          <Component Win64="$(var.Win64)" Id="cmp7B8B76C0A51A510E42C69FBD2AFEE720" Guid="*">
-            <File Id="filC72E0A8067C3BEBCE8601317876DD8E1" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-0.10/libgstaudioresample.dll"/>
+          <Component Win64="$(var.Win64)" Id="cmp577891EDF25587C451F9CD9ADEC17950" Guid="*">
+              <File Id="fil16D9F60F1B301EF89BA2D6461A513179" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstapp.dll"/>
           </Component>
-          <Component Win64="$(var.Win64)" Id="cmp53C421F37AE73DB2870712D406E4F3E0" Guid="*">
-            <File Id="fil4A75377A7BE277F915A5023DB03B5C79" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-0.10/libgstautodetect.dll"/>
+
+          <!-- gstreamer1-plugins-good -->
+          <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="cmp6E8C6F4DF3C3B92A048B56F3F66C3EE3" Guid="*">
-            <File Id="fil6E2A53710E8DE771899D8C8CD7D31DD7" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-0.10/libgstdirectsoundsink.dll"/>
+          <Component Win64="$(var.Win64)" Id="cmp574F320DE2435719116E0CEF13B93217" Guid="*">
+              <File Id="fil87705B6D7F276AC7CECB0A7A7BF03BAE" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstdirectsoundsink.dll"/>
           </Component>
-          <Component Win64="$(var.Win64)" Id="cmp1033FE4037888321EF58A3A3483D33DF" Guid="*">
-            <File Id="filD9DFB6EF45F3D820B16F4DE1E743E69E" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-0.10/libgstdirectsoundsrc.dll"/>
+
+          <!-- gstreamer1-plugins-bad -->
+          <Component Win64="$(var.Win64)" Id="cmp83B339398D5E5381DD1E992E16858015" Guid="*">
+              <File Id="filF556FED35C41B9063691FFEB1488F4EF" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstdirectsoundsrc.dll"/>
           </Component>
         </Directory>
-      </Directory>
+      </Directory> <!-- INSTALLDIR/lib -->
 
       <Directory Id="dirF9EC6C477871838DBC7E11B7064AF1DD" Name="share">
         <Directory Id="dirD59C138F8E9B90842CC4CED5FC7BD02A" Name="locale">
@@ -83,31 +88,40 @@
   <Fragment>
     <ComponentGroup Id="CG.spice-glib">
       <ComponentGroupRef Id="CG.usbredir"/>
-      <ComponentGroupRef Id="CG.gstreamer"/>
+      <ComponentGroupRef Id="CG.gstreamer1"/>
       <ComponentGroupRef Id="CG.openssl"/>
       <ComponentGroupRef Id="CG.pixman"/>
       <ComponentGroupRef Id="CG.libjpeg-turbo"/>
       <ComponentGroupRef Id="CG.celt051"/>
       <ComponentGroupRef Id="CG.opus"/>
       <ComponentGroupRef Id="CG.hicolor-icon-theme"/>
+      <!-- from spice -->
       <ComponentRef Id="cmp102591AAF331792A897FB24554275832"/>
       <ComponentRef Id="cmpD9079AE5EA50B2FAF0D89AA30A612B73"/>
       <ComponentRef Id="cmpF49F1DE553A3EB7F69C116932A799ADF"/>
-      <!-- gst-plugins-base -->
-      <ComponentRef Id="cmp4A56F2FEAA3A575F3561BD6E960B6B47"/>
-      <ComponentRef Id="cmp18ED35739242986000DC9D69D40BC8BC"/>
-      <ComponentRef Id="cmpF62FD2E4C8B2A5D7B1A253E0A362547A"/>
-      <ComponentRef Id="cmp60C1666B2D158B51EF557B7AC0CBFD17"/>
-      <!-- gst plugins -->
-      <ComponentRef Id="cmpF37CEFDBBF229DA58F7F7CB5184FF340"/>
-      <ComponentRef Id="cmp692250298EA7C7B39477952B28CF34CF"/>
-      <ComponentRef Id="cmpD7CA28D01407886511D335391289C0F2"/>
-      <ComponentRef Id="cmp30AFF452AB17BA179E4CF4E3AEB06266"/>
-      <ComponentRef Id="cmp32FD27BDAAA418E095B90F4713482B31"/>
-      <ComponentRef Id="cmp7B8B76C0A51A510E42C69FBD2AFEE720"/>
-      <ComponentRef Id="cmp53C421F37AE73DB2870712D406E4F3E0"/>
-      <ComponentRef Id="cmp6E8C6F4DF3C3B92A048B56F3F66C3EE3"/>
-      <ComponentRef Id="cmp1033FE4037888321EF58A3A3483D33DF"/>
+
+      <!-- from gstreamer1 (lib) -->
+      <ComponentRef Id="cmp0ACFE00C63B8A3232D2DEB869037D87C"/>
+
+      <!-- from gstreamer1-plugins-base (bin) -->
+      <ComponentRef Id="cmp41BC989F8EA49BB2E49028C69193B3BB"/>
+      <ComponentRef Id="cmpD6B03E1492CA64AF46E4C18AEFBDC51E"/>
+      <ComponentRef Id="cmp97F799D2F039ED8AE681FF26DAA62BC6"/>
+      <ComponentRef Id="cmpB7CAC9DC9890205AE57AE38AA3EAA3B5"/>
+      <ComponentRef Id="cmp93FAE555B2F925E239C97B777E49DB05"/>
+
+      <!-- from gstreamer1-plugins-base (lib) -->
+      <ComponentRef Id="cmpDBE70B8247EC74A22BC700164134F68A"/>
+      <ComponentRef Id="cmp4B0C983D765E7C44897E9143F454A027"/>
+      <ComponentRef Id="cmp8F07634CD23193CA1415D2F0F473FDC3"/>
+      <ComponentRef Id="cmp577891EDF25587C451F9CD9ADEC17950"/>
+
+      <!-- from gstreamer1-plugins-good (lib) -->
+      <ComponentRef Id="cmp6E40650EE781D7A31FD8621801955090"/>
+      <ComponentRef Id="cmp574F320DE2435719116E0CEF13B93217"/>
+
+      <!-- from gstreamer1-plugins-bad-free (lib) -->
+      <ComponentRef Id="cmp83B339398D5E5381DD1E992E16858015"/>
     </ComponentGroup>
   </Fragment>
 </Include>
-- 
cgit