From 00d8e8537372467c72308e5c895dc08985d4da02 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 19 Sep 2013 21:39:16 +0200 Subject: Revert "osxbundle: fonts.conf: only look for fonts in ~/.mpv/fonts" Commit broke text subtitles without embedded fonts. Will look for a better solution later. Revert it for now, since I'm starting to get bug reports. This reverts commit 4a9f618d9f3b2d964bcc819426cc3042b8e447f7. --- DOCS/man/en/options.rst | 7 ------- TOOLS/osxbundle/mpv.app/Contents/Resources/fonts.conf | 7 +++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index f9a75779f7..1c07403ea7 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1452,13 +1452,6 @@ options) are ignored when ASS-subtitles are rendered, unless the ``--no-ass`` option is specified. - .. note:: - - By default the OS X Application Bundle ships with a default fontconfig - fonts.conf that looks for fonts in the ``~/.mpv/fonts`` folder. It does - not include standard OS X paths to reduce the time spent to build - fontconfig's cache. - ``--osd-font-size=``, ``--sub-text-font-size=`` Specify the OSD/sub font size. The unit is the size in scaled pixels at a window height of 720. The actual pixel size is scaled with the window diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/fonts.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/fonts.conf index c229cd13c0..5a2e3d2222 100644 --- a/TOOLS/osxbundle/mpv.app/Contents/Resources/fonts.conf +++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/fonts.conf @@ -1,8 +1,11 @@ - ~/.mpv/fonts - ~/.mpv/.fontconfig-cache + /System/Library/Fonts + /Library/Fonts + ~/Library/Fonts + /Network/Library/Fonts + ~/.fontconfig