commit 599b5cffb34cd53c897a041256dad7f285cf3d02 parent e0236230318e638afbb75ef4a8c445885a54b07b Author: Alexander Kojevnikov <alexander@kojevnikov.com> Date: Thu, 13 May 2010 23:20:31 +1000 [win] Fix installation of gst plugins Diffstat:
| M | win/make-win32.sh | | | 15 | +++++++++++++++ |
| M | win/spek.wxs | | | 10 | +++++++--- |
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/win/make-win32.sh b/win/make-win32.sh @@ -34,13 +34,28 @@ urls=(\ "http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/avcodec-gpl-52.dll" \ "http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/avformat-gpl-52.dll" \ "http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/avutil-gpl-50.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/liba52-0.dll" \ "http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libbz2.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libdvdread-4.dll" \ "http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libfaac-0.dll" \ "http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libfaad-2.dll" \ "http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libFLAC-8.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libgcrypt-11.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libgnutls-26.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libgpg-error-0.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libjpeg-8.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libmp3lame-0.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libmpeg2-0.dll" \ "http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libogg-0.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/liboil-0.3-0.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libsoup-2.4-1.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libtasn1-3.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libtheoradec-1.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libtheoraenc-1.dll" \ "http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libvorbis-0.dll" \ "http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libvorbisenc-2.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libwavpack-1.dll" \ +"http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/libx264-67.dll" \ "http://ossbuild.googlecode.com/svn/trunk/Shared/Build/Windows/Win32/bin/z.dll" # GStreamer merge modules "http://ossbuild.googlecode.com/files/GStreamer-WinBuilds-Merge-Modules-x86.zip" diff --git a/win/spek.wxs b/win/spek.wxs @@ -50,9 +50,13 @@ </Component> <Directory Id="bin" Name="bin"> <Merge Id="GStreamer-Libraries" Language="1033" SourceFile="x86-OSSBuild-GStreamer-Libraries.msm" DiskId="1" /> - <Merge Id="GStreamer-Plugins-Base" Language="1033" SourceFile="x86-OSSBuild-GStreamer-Plugins-Base.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 Id="lib" Name="lib"> + <Directory Id="gstreamer_0.10" Name="gstreamer-0.10"> + <Merge Id="GStreamer-Plugins-Base" Language="1033" SourceFile="x86-OSSBuild-GStreamer-Plugins-Base.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>