[vlc-commits] Contribs: Update libass to 0.13.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Oct  6 16:05:14 2015 +0200| [6b261fd6577d980b85d1ad33b5d01e76c9b888e8] | committer: Jean-Baptiste Kempf

Contribs: Update libass to 0.13.0

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6b261fd6577d980b85d1ad33b5d01e76c9b888e8
---

 contrib/src/ass/SHA512SUMS       |    2 +-
 contrib/src/ass/ass-macosx.patch |   22 ++++++++++------------
 contrib/src/ass/rules.mak        |    2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/contrib/src/ass/SHA512SUMS b/contrib/src/ass/SHA512SUMS
index 9afca77..d378205 100644
--- a/contrib/src/ass/SHA512SUMS
+++ b/contrib/src/ass/SHA512SUMS
@@ -1 +1 @@
-676f3e64d721426a0de8457f9c5cab77d5a10599ef3008f0660e949dd344c8ce7170cb88656b9b7dad406e878504ab888fb6d38d95061b6320d9fc4ce7f4b03b  libass-0.12.1.tar.gz
+f6776cea3c7b9e47d1f275c7c66b4a6caef7cf25e69c7b4fa8d96474065ac34592cccbf76efb371abed3a353184ffd5b6888a7b6403d378305a60a37a034f67a  libass-0.13.0.tar.gz
diff --git a/contrib/src/ass/ass-macosx.patch b/contrib/src/ass/ass-macosx.patch
index 10376bf..f9d06e4 100644
--- a/contrib/src/ass/ass-macosx.patch
+++ b/contrib/src/ass/ass-macosx.patch
@@ -1,14 +1,12 @@
---- libass/libass/ass_fontconfig.c	2011-09-01 23:26:35.000000000 +0200
-+++ libass-fixed/libass/ass_fontconfig.c	2012-09-01 14:34:17.000000000 +0200
-@@ -442,6 +442,11 @@
+--- libass-0.13.0/libass/ass_fontconfig.c.orig	2015-10-06 16:03:01.104710780 +0200
++++ libass-0.13.0/libass/ass_fontconfig.c	2015-10-06 16:03:00.216719387 +0200
+@@ -282,6 +282,9 @@
                  "file found, using fallback.");
-         FcConfigDestroy(priv->config);
-         priv->config = FcInitLoadConfig();
-+#ifdef __APPLE__
-+        FcConfigAppFontAddDir(priv->config, "~/Library/Fonts");
-+        FcConfigAppFontAddDir(priv->config, "/Library/Fonts");
-+        FcConfigAppFontAddDir(priv->config, "/Network/Library/Fonts");
-+#endif
-         rc++;
+         FcConfigDestroy(fc->config);
+         fc->config = FcInitLoadConfig();
++        FcConfigAppFontAddDir(fc->config, "~/Library/Fonts");
++        FcConfigAppFontAddDir(fc->config, "/Library/Fonts");
++        FcConfigAppFontAddDir(fc->config, "/Network/Library/Fonts");
      }
-     if (rc && update) {
+     if (fc->config)
+         rc = FcConfigBuildFonts(fc->config);
diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index be528a9..0df6ad8 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -1,5 +1,5 @@
 # ASS
-ASS_VERSION := 0.12.1
+ASS_VERSION := 0.13.0
 ASS_URL := https://github.com/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz
 
 PKGS += ass