diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-09-19 21:39:16 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-09-19 21:39:16 +0200 |
commit | 00d8e8537372467c72308e5c895dc08985d4da02 (patch) | |
tree | 8ee3b9374ffa3a0d1af9b2f064f63fdf629f96f6 | |
parent | 2115c4a3ad751e887edae29bbf7002d6563fc631 (diff) | |
download | mpv-00d8e8537372467c72308e5c895dc08985d4da02.tar.bz2 mpv-00d8e8537372467c72308e5c895dc08985d4da02.tar.xz |
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.
-rw-r--r-- | DOCS/man/en/options.rst | 7 | ||||
-rw-r--r-- | 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=<size>``, ``--sub-text-font-size=<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 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> - <dir>~/.mpv/fonts</dir> - <cachedir>~/.mpv/.fontconfig-cache</cachedir> + <dir>/System/Library/Fonts</dir> + <dir>/Library/Fonts</dir> + <dir>~/Library/Fonts</dir> + <dir>/Network/Library/Fonts</dir> + <cachedir>~/.fontconfig</cachedir> <!-- Accept deprecated 'mono' alias, replacing it with 'monospace' |