Update dependencies

build/ffms2/ffms2.vcxproj

@@ -56,7 +56,9 @@
     <ClCompile Include="$(FfmsSrcDir)\src\core\audiosource.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\codectype.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\ffms.cpp" />
+    <ClCompile Include="$(FfmsSrcDir)\src\core\filehandle.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\haaliaudio.cpp" />
+    <ClCompile Include="$(FfmsSrcDir)\src\core\haalicommon.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\haaliindexer.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\haalivideo.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\indexing.cpp" />
@@ -66,13 +68,15 @@
     <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaaudio.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaindexer.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaparser.c" />
+    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskareader.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\matroskavideo.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\numthreads.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\stdiostream.c" />
+    <ClCompile Include="$(FfmsSrcDir)\src\core\track.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\utils.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\videosource.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\videoutils.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\wave64writer.cpp" />
+    <ClCompile Include="$(FfmsSrcDir)\src\core\zipfile.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(FfmsSrcDir)\include\ffms.h" />
@@ -85,15 +89,19 @@
     <ClInclude Include="$(FfmsSrcDir)\src\core\audiosource.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\codectype.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\coparser.h" />
+    <ClInclude Include="$(FfmsSrcDir)\src\core\filehandle.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\guids.h" />
+    <ClInclude Include="$(FfmsSrcDir)\src\core\haalicommon.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\indexing.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\matroskaparser.h" />
+    <ClInclude Include="$(FfmsSrcDir)\src\core\matroskareader.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\numthreads.h" />
-    <ClInclude Include="$(FfmsSrcDir)\src\core\stdiostream.h" />
+    <ClInclude Include="$(FfmsSrcDir)\src\core\track.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\utils.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\videosource.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\videoutils.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\wave64writer.h" />
+    <ClInclude Include="$(FfmsSrcDir)\src\core\zipfile.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\vapoursynth\VapourSynth.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\vapoursynth\vapoursource.h" />
   </ItemGroup>

build/ffms2/ffms2.vcxproj.filters

@@ -75,9 +75,6 @@
     <ClCompile Include="$(FfmsSrcDir)\src\core\numthreads.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\stdiostream.c">
-      <Filter>Utils</Filter>
-    </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\utils.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
@@ -108,6 +105,21 @@
     <None Include="$(FfmsSrcDir)\src\vapoursynth\vapoursynth.cpp">
       <Filter>VapourSynth</Filter>
     </None>
+    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskareader.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FfmsSrcDir)\src\core\filehandle.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FfmsSrcDir)\src\core\haalicommon.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FfmsSrcDir)\src\core\zipfile.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FfmsSrcDir)\src\core\track.cpp">
+      <Filter>Indexing</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(FfmsSrcDir)\src\core\audiosource.h">
@@ -140,9 +152,6 @@
     <ClInclude Include="$(FfmsSrcDir)\src\core\numthreads.h">
       <Filter>Utils</Filter>
     </ClInclude>
-    <ClInclude Include="$(FfmsSrcDir)\src\core\stdiostream.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
     <ClInclude Include="$(FfmsSrcDir)\src\core\utils.h">
       <Filter>Utils</Filter>
     </ClInclude>
@@ -173,5 +182,20 @@
     <ClInclude Include="$(FfmsSrcDir)\src\vapoursynth\VapourSynth.h">
       <Filter>VapourSynth</Filter>
     </ClInclude>
+    <ClInclude Include="$(FfmsSrcDir)\src\core\matroskareader.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FfmsSrcDir)\src\core\filehandle.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FfmsSrcDir)\src\core\haalicommon.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FfmsSrcDir)\src\core\zipfile.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FfmsSrcDir)\src\core\track.h">
+      <Filter>Indexing</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

build/fontconfig/fontconfig.vcxproj

@@ -36,37 +36,49 @@
     </InstallHeader>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(FontconfigSrcDir)\win32\src\dirent.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcatomic.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcblanks.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fccache.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fccfg.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fccharset.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fccompat.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcdbg.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcdefault.c" />
-    <ClCompile Include="$(FontconfigSrcDir)\src\fcdir.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcdir.cpp" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcformat.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcfreetype.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcfs.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fchash.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcinit.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fclang.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fclist.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcmatch.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcmatrix.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcname.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcobjs.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcpat.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcserialize.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcstat.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcstr.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcxml.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\ftglue.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\win32\src\dirent.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(FontconfigSrcDir)\win32\include\config.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcfreetype.h" />
-    <ClInclude Include="$(FontconfigSrcDir)\win32\include\dirent.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcprivate.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fontconfig.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcarch.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcatomic.h" />
     <ClInclude Include="$(FontconfigSrcDir)\src\fcdeprecate.h" />
     <ClInclude Include="$(FontconfigSrcDir)\src\fcftint.h" />
     <ClInclude Include="$(FontconfigSrcDir)\src\fcint.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcmutex.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcobjs.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcobjshash.gperf.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcwindows.h" />
     <ClInclude Include="$(FontconfigSrcDir)\src\ftglue.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\win32\include\config.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\win32\include\dirent.h" />
   </ItemGroup>
 </Project>

build/fontconfig/fontconfig.vcxproj.filters

@@ -38,9 +38,6 @@
     <ClCompile Include="$(FontconfigSrcDir)\src\fcdefault.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(FontconfigSrcDir)\src\fcdir.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(FontconfigSrcDir)\src\fcformat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -83,14 +80,23 @@
     <ClCompile Include="$(FontconfigSrcDir)\src\ftglue.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcstat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcobjs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FontconfigSrcDir)\src\fccompat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FontconfigSrcDir)\src\fchash.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcdir.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(FontconfigSrcDir)\win32\headers\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(FontconfigSrcDir)\win32\headers\dirent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(FontconfigSrcDir)\src\fcdeprecate.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -103,5 +109,38 @@
     <ClInclude Include="$(FontconfigSrcDir)\src\ftglue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\win32\include\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\win32\include\dirent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcfreetype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcprivate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fontconfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcarch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcatomic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcmutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcobjs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcobjshash.gperf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcwindows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

build/freetype2/freetype.vcxproj

@@ -30,22 +30,18 @@
 
   <!-- Source files -->
   <ItemGroup>
-    <InstallHeader Include="$(Freetype2SrcDir)\include\ft2build.h" />
+    <InstallHeader Include="$(Freetype2SrcDir)\include\*.h" />
-    <InstallHeader Include="$(Freetype2SrcDir)\include\freetype\*.h">
+    <InstallHeader Include="$(Freetype2SrcDir)\include\config\*.h">
-      <Destination>freetype\</Destination>
+      <Destination>config\</Destination>
     </InstallHeader>
-    <InstallHeader Include="$(Freetype2SrcDir)\include\freetype\config\*.h">
+    <InstallHeader Include="$(Freetype2SrcDir)\include\internal\*.h">
-      <Destination>freetype\config\</Destination>
+      <Destination>internal\</Destination>
     </InstallHeader>
-    <InstallHeader Include="$(Freetype2SrcDir)\include\freetype\internal\*.h">
+    <InstallHeader Include="$(Freetype2SrcDir)\include\internal\services*.h">
-      <Destination>freetype\internal\</Destination>
+      <Destination>internal\services\</Destination>
-    </InstallHeader>
-    <InstallHeader Include="$(Freetype2SrcDir)\include\freetype\internal\services*.h">
-      <Destination>freetype\internal\services\</Destination>
     </InstallHeader>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(Freetype2SrcDir)\builds\win32\ftdebug.c" />
     <ClCompile Include="$(Freetype2SrcDir)\src\autofit\autofit.c" />
     <ClCompile Include="$(Freetype2SrcDir)\src\base\ftbase.c" />
     <ClCompile Include="$(Freetype2SrcDir)\src\base\ftbbox.c" />

build/freetype2/freetype.vcxproj.filters

@@ -14,9 +14,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(Freetype2SrcDir)\builds\win32\ftdebug.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(Freetype2SrcDir)\src\autofit\autofit.c">
       <Filter>Source Files</Filter>
     </ClCompile>

build/wx/setup-installed.h

@@ -30,20 +30,13 @@
 #pragma comment(lib, wxWX_LIB_NAME("base", ""))
 #pragma comment(lib, wxBASE_LIB_NAME("net"))
 #pragma comment(lib, wxBASE_LIB_NAME("xml"))
-#pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
 #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
-#pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
 #pragma comment(lib, wx3RD_PARTY_LIB_NAME("png"))
-#pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
 #pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
 #pragma comment(lib, wxMSW_LIB_NAME("core"))
 #pragma comment(lib, wxMSW_LIB_NAME("adv"))
-#pragma comment(lib, wxMSW_LIB_NAME("html"))
 #pragma comment(lib, wxMSW_LIB_NAME("gl"))
 #pragma comment(lib, wxMSW_LIB_NAME("qa"))
-#pragma comment(lib, wxMSW_LIB_NAME("propgrid"))
-#pragma comment(lib, wxMSW_LIB_NAME("ribbon"))
-#pragma comment(lib, wxMSW_LIB_NAME("richtext"))
 #pragma comment(lib, wxMSW_LIB_NAME("stc"))
 #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
 #pragma comment(lib, "kernel32")

build/wx/wxWidgets.vcxproj

@@ -16,7 +16,7 @@
     <WxTargetCpu Condition="$(Platform) == 'x64'">X64</WxTargetCpu>
     <WxBuild Condition="$(Configuration) == 'Debug'">debug</WxBuild>
     <WxBuild Condition="$(Configuration) == 'Release'">release</WxBuild>
-    <NMakeArgs>LIBDIRNAME=$(AegisubLibraryDir) OBJS=$(AegisubObjectDir) SHARED=0 UNICODE=0 USE_OPENGL=1 VENDOR=aegisub TARGET_CPU=$(WxTargetCpu) BUILD=$(WxBuild)</NMakeArgs>
+    <NMakeArgs>LIBDIRNAME=$(AegisubLibraryDir) OBJS=$(AegisubObjectDir) SHARED=0 UNICODE=0 USE_OPENGL=1 USE_WEBVIEW=0 USE_HTML=0 USE_MEDIA=0 USE_XRC=0 USE_AUI=0 USE_RIBBON=0 USE_PROPGRID=0 USE_RICHTEXT=0 USE_CAIRO=0 VENDOR=aegisub TARGET_CPU=$(WxTargetCpu) BUILD=$(WxBuild)</NMakeArgs>
     <LibraryNameSuffix Condition="$(Configuration) == 'Debug'">d</LibraryNameSuffix>
   </PropertyGroup>
 

vendor/boost

@@ -1 +1 @@
-Subproject commit f866ff6fea187a5c9ad80895f078dec577cdc304
+Subproject commit 614aac8fef2a0551610f72e5c4a61085c8c06e35

vendor/ffmpeg

@@ -1 +1 @@
-Subproject commit f29cdbe1b59a0d997733b507041e15ec68cef00c
+Subproject commit 05d7059ac6b640796001bf347d309a40a4fd4a12

vendor/ffms2

@@ -1 +1 @@
-Subproject commit 57ae96282eafec99153037423c33ebd29b40171a
+Subproject commit 1a7fc3f6083286da59dfaf8915e4bf543aa4bd37

vendor/fontconfig

@@ -1 +1 @@
-Subproject commit b16b9f0b51fcb3a96dbf81898cc5b0fa98937f7f
+Subproject commit 6c22e896d4593e6f28ab2ab7f3c6b8f0b0df7857

vendor/freetype2

@@ -1 +1 @@
-Subproject commit 52381c14e3a30a5597060894d9f049420a2f3ac0
+Subproject commit ed372b712fa698da24c21746135f2c2c8d738c6e

vendor/fribidi

@@ -1 +1 @@
-Subproject commit c1d48ee98b3d254a6b943851665b83cdd76f6150
+Subproject commit 77f7f6c0bb16b89eac1e3b3d264f49b2ee02de3e

vendor/googletest

@@ -1 +1 @@
-Subproject commit b3d0b4ea4ab877a355e79dd0de704577811fff0f
+Subproject commit cc0116f14aa8ad9ab76226d082a96b1005221816

vendor/libass

@@ -1 +1 @@
-Subproject commit de3f0e7572fb927d10857d4177ef58be2c9b3dbc
+Subproject commit d8fc873c07eed4666ceb04febf1e84cab8a4ac63

vendor/wxWidgets

@@ -1 +1 @@
-Subproject commit f2bbf083c63bd10e08f35ffd21cfa2864028fae8
+Subproject commit 37dd8f5b7b9bbc34f892f3579779c27509988c4e