GNOME.org
 

[msitools: 2/4] wxi: remove gstreamer 0.x, and dependencies


commit 981216f39cedfebe2829e176564a32339e1b6c9d
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Mon Jan 11 10:19:39 2021 +0400

    wxi: remove gstreamer 0.x, and dependencies
    
    Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>

 .gitlab-ci.yml                            |  10 -
 data/meson.build                          |   5 -
 data/wixl/OpenEXR.wxi                     |  25 --
 data/wixl/celt051.wxi                     |  30 ---
 data/wixl/gstreamer-plugins-base.wxi      | 377 ----------------------------
 data/wixl/gstreamer.wxi                   | 395 ------------------------------
 data/wixl/gstreamer1-plugins-bad-free.wxi |  13 -
 data/wixl/ilmbase.wxi                     |  35 ---
 data/wixl/speex.wxi                       |   2 +
 data/wxi-validate.pl                      |   3 +
 10 files changed, 5 insertions(+), 890 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c30e2fd..408ae9a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,8 +16,6 @@ variables:
                 mingw64-bzip2
                 mingw32-cairo
                 mingw64-cairo
-                mingw32-celt051
-                mingw64-celt051
                 mingw32-curl
                 mingw64-curl
                 mingw32-dlfcn
@@ -54,10 +52,6 @@ variables:
                 mingw64-gstreamer1-plugins-good
                 mingw32-gstreamer1
                 mingw64-gstreamer1
-                mingw32-gstreamer-plugins-base
-                mingw64-gstreamer-plugins-base
-                mingw32-gstreamer
-                mingw64-gstreamer
                 mingw32-gtk2
                 mingw64-gtk2
                 mingw32-gtk3
@@ -72,8 +66,6 @@ variables:
                 mingw64-hicolor-icon-theme
                 mingw32-icu
                 mingw64-icu
-                mingw32-ilmbase
-                mingw64-ilmbase
                 mingw32-jasper
                 mingw64-jasper
                 mingw32-json-glib
@@ -118,8 +110,6 @@ variables:
                 mingw64-libxml2
                 mingw32-nettle
                 mingw64-nettle
-                mingw32-OpenEXR
-                mingw64-OpenEXR
                 mingw32-openssl
                 mingw64-openssl
                 mingw32-opus
diff --git a/data/meson.build b/data/meson.build
index 8fec5c1..c414561 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,12 +1,10 @@
 wxi_data = files(
-  'wixl/OpenEXR.wxi',
   'wixl/SDL.wxi',
   'wixl/adwaita-icon-theme.wxi',
   'wixl/atk.wxi',
   'wixl/brotli.wxi',
   'wixl/bzip2.wxi',
   'wixl/cairo.wxi',
-  'wixl/celt051.wxi',
   'wixl/curl.wxi',
   'wixl/dlfcn.wxi',
   'wixl/expat.wxi',
@@ -22,8 +20,6 @@ wxi_data = files(
   'wixl/gmp.wxi',
   'wixl/gnutls.wxi',
   'wixl/gsm.wxi',
-  'wixl/gstreamer-plugins-base.wxi',
-  'wixl/gstreamer.wxi',
   'wixl/gstreamer1-plugins-bad-free.wxi',
   'wixl/gstreamer1-plugins-base.wxi',
   'wixl/gstreamer1-plugins-good.wxi',
@@ -35,7 +31,6 @@ wxi_data = files(
   'wixl/harfbuzz.wxi',
   'wixl/hicolor-icon-theme.wxi',
   'wixl/icu.wxi',
-  'wixl/ilmbase.wxi',
   'wixl/jasper.wxi',
   'wixl/json-glib.wxi',
   'wixl/libcacard.wxi',
diff --git a/data/wixl/gstreamer1-plugins-bad-free.wxi b/data/wixl/gstreamer1-plugins-bad-free.wxi
index 7224071..6d4156e 100644
--- a/data/wixl/gstreamer1-plugins-bad-free.wxi
+++ b/data/wixl/gstreamer1-plugins-bad-free.wxi
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?require gstreamer1-plugins-base.wxi?>
-<?require OpenEXR.wxi?>
 <?require gcc-c++.wxi?>
 <?require libxml2.wxi?>
 <?require nettle.wxi?>
@@ -101,9 +100,6 @@
           <Component Win64="$(var.Win64)" Id="cmpF3A7DA356D8A5E9DA6767517F0FD91FB" Guid="*">
             <File Id="filBA1195BAE9888895F8108D8294B39371" KeyPath="yes" 
Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstd3d.dll"/>
           </Component>
-          <Component Win64="$(var.Win64)" Id="cmpD9F44A71152095BB1311504F5E2746D5" Guid="*">
-            <File Id="filD5CA45FE4DE3366CA45CF6EF52B4F27E" KeyPath="yes" 
Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstdashdemux.dll"/>
-          </Component>
           <Component Win64="$(var.Win64)" Id="cmp636E288E0B7C6AEB2990AF348215C9AA" Guid="*">
             <File Id="fil6E61195A144A411D39C8800DB077AAE0" KeyPath="yes" 
Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstdebugutilsbad.dll"/>
           </Component>
@@ -191,9 +187,6 @@
           <Component Win64="$(var.Win64)" Id="cmp88A44C9FDB695E9AE413FC989E426434" Guid="*">
             <File Id="fil51A1D24EB330CC534E08A14D34BFA01A" KeyPath="yes" 
Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstnetsim.dll"/>
           </Component>
-          <Component Win64="$(var.Win64)" Id="cmpA51A4882249288BCBF783B2B8F6C3F58" Guid="*">
-            <File Id="fil7D04370A014E2CE2B0DB5B0D13ADA733" KeyPath="yes" 
Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstopenexr.dll"/>
-          </Component>
           <Component Win64="$(var.Win64)" Id="cmpD4E115B11B1C07D461165365952FB3D8" Guid="*">
             <File Id="fil35CDBAAD35D1174AABBC81C300B55212" KeyPath="yes" 
Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstopusparse.dll"/>
           </Component>
@@ -263,9 +256,6 @@
           <Component Win64="$(var.Win64)" Id="cmp5CF73AEA20BA7CA3C8E57BF0B598376D" Guid="*">
             <File Id="filE3C022E556A01F85D0A6E3E34AACB321" KeyPath="yes" 
Source="$(var.SourceDir)/lib/gstreamer-1.0/libgsty4mdec.dll"/>
           </Component>
-          <Component Win64="$(var.Win64)" Id="cmp03E4257DBD437EED77ADC36F26D13C18" Guid="*">
-            <File Id="fil29987D20608A2FEDB9A32963DD604590" KeyPath="yes" 
Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstyadif.dll"/>
-          </Component>
         </Directory>
       </Directory>
       <Directory Id="dir14817211F18360C7084B253DE4EA6968" Name="share">
@@ -600,7 +590,6 @@
       <ComponentRef Id="cmpD3169FDE8F254F6BAB999FDC971DC896"/>
       <ComponentRef Id="cmp83B90DFB1EDBF160FA4CFCCD84AC9F77"/>
       <ComponentRef Id="cmpF3A7DA356D8A5E9DA6767517F0FD91FB"/>
-      <ComponentRef Id="cmpD9F44A71152095BB1311504F5E2746D5"/>
       <ComponentRef Id="cmp636E288E0B7C6AEB2990AF348215C9AA"/>
       <ComponentRef Id="cmpCFEA83DEABF93897510F3B125FAD3587"/>
       <ComponentRef Id="cmp83B339398D5E5381DD1E992E16858015"/>
@@ -630,7 +619,6 @@
       <ComponentRef Id="cmpCE4AF2BF5CCCCAED42E2B4F67D1B7BDE"/>
       <ComponentRef Id="cmp2BE4E40CAEDD29B510E7D2B8EF41DCAA"/>
       <ComponentRef Id="cmp88A44C9FDB695E9AE413FC989E426434"/>
-      <ComponentRef Id="cmpA51A4882249288BCBF783B2B8F6C3F58"/>
       <ComponentRef Id="cmpD4E115B11B1C07D461165365952FB3D8"/>
       <ComponentRef Id="cmp3EE8E68CC754693F270A95AF269F9338"/>
       <ComponentRef Id="cmpB127DDDC0A2E1F900291F6BE245CB844"/>
@@ -654,7 +642,6 @@
       <ComponentRef Id="cmp4D572CA37022D65E2503FFF2953FC253"/>
       <ComponentRef Id="cmpFEE2216B50BA31DFF5764437AD124B4B"/>
       <ComponentRef Id="cmp5CF73AEA20BA7CA3C8E57BF0B598376D"/>
-      <ComponentRef Id="cmp03E4257DBD437EED77ADC36F26D13C18"/>
       <ComponentRef Id="cmp8087692860F18BC0AF4A7E42D2B9BC5B"/>
       <ComponentRef Id="cmp2043CAC739EF592EE26EFBE74D87EC68"/>
       <ComponentRef Id="cmp3398072EF8D836C5D7975126A8318A35"/>
diff --git a/data/wixl/speex.wxi b/data/wixl/speex.wxi
index 50607b8..556e33c 100644
--- a/data/wixl/speex.wxi
+++ b/data/wixl/speex.wxi
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
@@ -11,6 +12,7 @@
   </Fragment>
   <Fragment>
     <ComponentGroup Id="CG.speex">
+      <ComponentGroupRef Id="CG.gcc"/>
       <ComponentRef Id="cmpDA747289BB4C3EE4BF1C70297CF60D12"/>
     </ComponentGroup>
   </Fragment>
diff --git a/data/wxi-validate.pl b/data/wxi-validate.pl
index 1ec9bde..ef1132e 100755
--- a/data/wxi-validate.pl
+++ b/data/wxi-validate.pl
@@ -51,9 +51,12 @@ my %dllbuiltin = (
     "comdlg32.dll" => 1,
     "crypt32.dll" => 1,
     "d3d9.dll" => 1,
+    "d3d10.dll" => 1,
+    "d3d11.dll" => 1,
     "dnsapi.dll" => 1,
     "dsound.dll" => 1,
     "dwmapi.dll" => 1,
+    "dxgi.dll" => 1,
     "gdi32.dll" => 1,
     "gdiplus.dll" => 1,
     "imm32.dll" => 1,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]