From 15d78ed190bcf3e834fd0c888d214a70d9cb025c Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 11 Oct 2015 20:56:38 -0700
Subject: [PATCH] Update to libass 0.13.1

---
 build/libass/config.h               |  5 ++---
 build/libass/dirent.h               |  6 ++++++
 build/libass/libass.vcxproj         |  8 +++++++-
 build/libass/libass.vcxproj.filters | 18 ++++++++++++++++++
 vendor/libass                       |  2 +-
 5 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 build/libass/dirent.h

diff --git a/build/libass/config.h b/build/libass/config.h
index 9077eac2c..9b46c3714 100644
--- a/build/libass/config.h
+++ b/build/libass/config.h
@@ -1,7 +1,6 @@
 #define _CRT_SECURE_NO_WARNINGS
 #define _CRT_NONSTDC_NO_DEPRECATE
 
-#define CONFIG_FONTCONFIG 1
 #define CONFIG_ASM 1
-
-#define M_PI 3.1415926535897932384626433832795
+#define CONFIG_FONTCONFIG 1
+#define CONFIG_RASTERIZER 1
diff --git a/build/libass/dirent.h b/build/libass/dirent.h
new file mode 100644
index 000000000..fcbd0289b
--- /dev/null
+++ b/build/libass/dirent.h
@@ -0,0 +1,6 @@
+// libass uses dirent in a function we don't use, so just provide a dummy version
+typedef struct DIR { int dummy; } DIR;
+typedef struct dirent { char *d_name; } dirent;
+static inline DIR *opendir(const char *x) { return 0; }
+static inline struct dirent *readdir(DIR *x) { return 0; }
+static inline void closedir(DIR *x) { }
diff --git a/build/libass/libass.vcxproj b/build/libass/libass.vcxproj
index ad44c1d2f..e78c993fe 100644
--- a/build/libass/libass.vcxproj
+++ b/build/libass/libass.vcxproj
@@ -52,6 +52,7 @@
       <ExcludeFromBuild Condition="'$(Platform)'!='x64'">true</ExcludeFromBuild>
     </Yasm>
     <Yasm Include="$(LibassSrcDir)\libass\x86\blend_bitmaps.asm" />
+    <Yasm Include="$(LibassSrcDir)\libass\x86\blur.asm" />
     <Yasm Include="$(LibassSrcDir)\libass\x86\cpuid.asm" />
     <Yasm Include="$(LibassSrcDir)\libass\x86\rasterizer.asm" />
     <None Include="$(LibassSrcDir)\libass\x86\x86inc.asm" />
@@ -81,15 +82,20 @@
   <ItemGroup>
     <ClCompile Include="$(LibassSrcDir)\libass\ass.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_bitmap.c" />
+    <ClCompile Include="$(LibassSrcDir)\libass\ass_blur.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_cache.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_drawing.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_font.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_fontconfig.c" />
+    <ClCompile Include="$(LibassSrcDir)\libass\ass_fontselect.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_library.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_parse.c" />
+    <ClCompile Include="$(LibassSrcDir)\libass\ass_rasterizer.c" />
+    <ClCompile Include="$(LibassSrcDir)\libass\ass_rasterizer_c.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_render.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_render_api.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_shaper.c" />
+    <ClCompile Include="$(LibassSrcDir)\libass\ass_string.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_strtod.c" />
     <ClCompile Include="$(LibassSrcDir)\libass\ass_utils.c" />
   </ItemGroup>
@@ -106,4 +112,4 @@
       <Project>{fb8e8d19-a4d6-4181-943c-282075f49b41}</Project>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/libass/libass.vcxproj.filters b/build/libass/libass.vcxproj.filters
index 06cc65846..f9c3571ba 100644
--- a/build/libass/libass.vcxproj.filters
+++ b/build/libass/libass.vcxproj.filters
@@ -28,6 +28,9 @@
     <Yasm Include="$(LibassSrcDir)\libass\x86\blend_bitmaps.asm">
       <Filter>Assembly Files</Filter>
     </Yasm>
+    <Yasm Include="$(LibassSrcDir)\libass\x86\blur.asm">
+      <Filter>Assembly Files</Filter>
+    </Yasm>
     <Yasm Include="$(LibassSrcDir)\libass\x86\cpuid.asm">
       <Filter>Assembly Files</Filter>
     </Yasm>
@@ -113,6 +116,9 @@
     <ClCompile Include="$(LibassSrcDir)\libass\ass_bitmap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(LibassSrcDir)\libass\ass_blur.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="$(LibassSrcDir)\libass\ass_cache.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -125,12 +131,21 @@
     <ClCompile Include="$(LibassSrcDir)\libass\ass_fontconfig.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(LibassSrcDir)\libass\ass_fontselect.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="$(LibassSrcDir)\libass\ass_library.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(LibassSrcDir)\libass\ass_parse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(LibassSrcDir)\libass\ass_rasterizer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LibassSrcDir)\libass\ass_rasterizer_c.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="$(LibassSrcDir)\libass\ass_render.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -140,6 +155,9 @@
     <ClCompile Include="$(LibassSrcDir)\libass\ass_shaper.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(LibassSrcDir)\libass\ass_string.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="$(LibassSrcDir)\libass\ass_strtod.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/vendor/libass b/vendor/libass
index b732598bc..cfa1a61e3 160000
--- a/vendor/libass
+++ b/vendor/libass
@@ -1 +1 @@
-Subproject commit b732598bcbefa6949986fc328b2238589eaf63b6
+Subproject commit cfa1a61e39f218fe4dc288ddf44b85200ff35fdd