videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-07-21 07:24:15 +02:00
Code Releases Activity

Contribs: Update libass to 0.13.0

Browse Source
This commit is contained in:
Jean-Baptiste Kempf 2015-10-06 16:05:14 +02:00
parent 8b4710ac6e
commit 6b261fd657
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/ass/SHA512SUMS
View File

@ -1 +1 @@
676f3e64d721426a0de8457f9c5cab77d5a10599ef3008f0660e949dd344c8ce7170cb88656b9b7dad406e878504ab888fb6d38d95061b6320d9fc4ce7f4b03b libass-0.12.1.tar.gz
f6776cea3c7b9e47d1f275c7c66b4a6caef7cf25e69c7b4fa8d96474065ac34592cccbf76efb371abed3a353184ffd5b6888a7b6403d378305a60a37a034f67a libass-0.13.0.tar.gz

22
contrib/src/ass/ass-macosx.patch
View File

@ -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);

2
contrib/src/ass/rules.mak
View File

@ -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