From 72039afa66213a5d4c16396c16be227f7e858a63 Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Sat, 10 Jul 2010 16:05:53 +1000
Subject: [PATCH] [win] Replace GStreamer with FFmpeg in the installer

---
 win/bundle.sh | 44 ++++++++++++++------------------------------
 win/spek.wxs  | 18 ------------------
 2 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/win/bundle.sh b/win/bundle.sh
index ddfc571..ba71fce 100755
--- a/win/bundle.sh
+++ b/win/bundle.sh
@@ -35,8 +35,8 @@ urls=(\
 "http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.0-1_win32.zip" \
 "http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libxml2_2.7.7-1_win32.zip" \
 "http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib_1.2.4-2_win32.zip" \
-# GStreamer merge modules
-"http://ossbuild.googlecode.com/files/GStreamer-WinBuilds-Merge-Modules-x86.zip"
+# FFmpeg
+"http://ffmpeg.arrozcru.org/autobuilds/ffmpeg/mingw32/shared/ffmpeg-r24135-swscale-r31628-mingw32-shared.7z"
 )
 
 for url in ${urls[*]}
@@ -54,38 +54,17 @@ done
 
 # Clean up
 rm -fr share/locale
-mv x86-OSSBuild-GStreamer-Dependencies-GPL.msm ..
-mv x86-OSSBuild-GStreamer-Libraries.msm ..
-mv x86-OSSBuild-GStreamer-Plugins-Bad-GPL.msm ..
-mv x86-OSSBuild-GStreamer-Plugins-Base.msm ..
-mv x86-OSSBuild-GStreamer-Plugins-FFmpeg-GPL.msm ..
-mv x86-OSSBuild-GStreamer-Plugins-Good.msm ..
-mv x86-OSSBuild-GStreamer-Plugins-Ugly-GPL.msm ..
-rm *.msm
+rm -fr doc
+rm -fr presets
+rm *.txt
+rm bin/avdevice* bin/avfilter* bin/swscale* bin/ff*.exe
+mv licenses share/
 
 # Set the default GTK theme
 echo "gtk-theme-name = \"MS-Windows\"" > etc/gtk-2.0/gtkrc
 
 cd ..
 
-# Extract files from x86-OSSBuild-GStreamer-Dependencies-GPL.msm
-mkdir deps
-"$WIX_PATH"/dark x86-OSSBuild-GStreamer-Dependencies-GPL.msm -o deps/deps.wxs -x deps
-
-for line in $(grep "<File" deps/deps.wxs | sed -e "s/.* Name=\"\([^\"]*\)\".* Source=\"\([^\"]*\)\".*/\1;\2/g"); do
-  line=${line//\\/\/}
-  name=${line%;*}
-  src=${line#*;}
-  dst="Spek/bin/$name"
-  # Move but don't overwrite the existing file
-  if [ ! -f "$dst" ] ; then
-    mv -v "$src" "$dst"
-  fi
-done
-
-# Create a zip archive
-"$SZ_PATH"/7z a spek.zip Spek
-
 # Generate a wxs for files in Spek
 "$WIX_PATH"/heat dir Spek -gg -ke -srd -cg Files -dr INSTALLLOCATION -template fragment -o files.wxs
 
@@ -94,8 +73,13 @@ done
 "$WIX_PATH"/light -ext WixUIExtension.dll -b Spek spek.wixobj files.wixobj -o spek.msi
 
 # Clean up
-rm -fr deps
-rm *.msm
+rm *.res
 rm *.wixobj
+rm *.wixpdb
+
+# Create a zip archive
+cp LICENSE.rtf Spek/
+cp spek.ico Spek/
+"$SZ_PATH"/7z a spek.zip Spek
 
 popd
\ No newline at end of file
diff --git a/win/spek.wxs b/win/spek.wxs
index 0810970..03d01ca 100644
--- a/win/spek.wxs
+++ b/win/spek.wxs
@@ -77,18 +77,6 @@
             <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\.$(var.ext)\OpenWithProgids" Name="Spek.Audio" Value="" Type="string" />
             <?endforeach?>
           </Component>
-          <Directory Id="bin" Name="bin">
-            <Merge Id="GStreamer-Libraries" Language="1033" SourceFile="x86-OSSBuild-GStreamer-Libraries.msm" DiskId="1" />
-          </Directory>
-          <Directory Id="lib" Name="lib">
-            <Directory Id="gstreamer_0.10" Name="gstreamer-0.10">
-              <Merge Id="GStreamer-Plugins-Bad-GPL" Language="1033" SourceFile="x86-OSSBuild-GStreamer-Plugins-Bad-GPL.msm" DiskId="1" />
-              <Merge Id="GStreamer-Plugins-Base" Language="1033" SourceFile="x86-OSSBuild-GStreamer-Plugins-Base.msm" DiskId="1" />
-              <Merge Id="GStreamer-Plugins-FFmpeg-GPL" Language="1033" SourceFile="x86-OSSBuild-GStreamer-Plugins-FFmpeg-GPL.msm" DiskId="1" />
-              <Merge Id="GStreamer-Plugins-Good" Language="1033" SourceFile="x86-OSSBuild-GStreamer-Plugins-Good.msm" DiskId="1" />
-              <Merge Id="GStreamer-Plugins-Ugly-GPL" Language="1033" SourceFile="x86-OSSBuild-GStreamer-Plugins-Ugly-GPL.msm" DiskId="1" />
-            </Directory>
-          </Directory>
         </Directory>
       </Directory>
     </Directory>
@@ -97,12 +85,6 @@
       <ComponentGroupRef Id="Files" />
       <ComponentRef Id="StartMenuShortcut" />
       <ComponentRef Id="DesktopShortcut" />
-      <MergeRef Id="GStreamer-Libraries" />
-      <MergeRef Id="GStreamer-Plugins-Bad-GPL" />
-      <MergeRef Id="GStreamer-Plugins-Base" />
-      <MergeRef Id="GStreamer-Plugins-FFmpeg-GPL" />
-      <MergeRef Id="GStreamer-Plugins-Good" />
-      <MergeRef Id="GStreamer-Plugins-Ugly-GPL" />
     </Feature>
   </Product>
 </Wix>