openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File mpv_PR10838.patch of Package mpv (Revision 0e8e997312331524a1cc9bebec1e9545)

Currently displaying revision 0e8e997312331524a1cc9bebec1e9545 , Show latest

From 0ba57fb8bdd6afa98ec593b232e170b653445132 Mon Sep 17 00:00:00 2001
From: Dudemanguy <random342@airmail.cc>
Date: Mon, 7 Nov 2022 18:02:22 -0600
Subject: [PATCH 1/4] osdep: separate out macos paths from path-unix.c

macOS really has completely different path conventions that mpv doesn't
take into account and it treats it just like any other old unix-like
system. This means mpv enforces certain conventions on it (like all the
XDG stuff) that doesn't really apply. Since we'd like to use more of
this but at the same time not distrupt mac users even more, let's just
copy and paste the current code to a new file, update the build and call
it a day. This way, the paths of these two platforms can more freely
diverge.
---
 meson.build         |  9 ++++---
 options/path.c      |  4 ++-
 osdep/path-darwin.c | 66 +++++++++++++++++++++++++++++++++++++++++++++
 osdep/path.h        |  1 +
 wscript             |  5 ++++
 wscript_build.py    |  3 ++-
 6 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 osdep/path-darwin.c

diff --git a/meson.build b/meson.build
index 45b9dbbf54a..cd7c5a3d401 100644
--- a/meson.build
+++ b/meson.build
@@ -293,6 +293,8 @@ endif
 darwin = host_machine.system() == 'darwin'
 win32 = host_machine.system() == 'cygwin' or host_machine.system() == 'windows'
 posix = not win32
+
+features += {'darwin': darwin}
 features += {'posix': posix}
 features += {'dos-paths': win32, 'win32': win32}
 
@@ -407,7 +409,6 @@ endif
 
 if posix
     sources += files('input/ipc-unix.c',
-                     'osdep/path-unix.c',
                      'osdep/polldev.c',
                      'osdep/subprocess-posix.c',
                      'osdep/terminal-unix.c',
@@ -419,11 +420,13 @@ if posix and not features['cocoa']
 endif
 
 if darwin
-    sources += files('osdep/timer-darwin.c')
+    sources += files('osdep/path-darwin.c',
+                     'osdep/timer-darwin.c')
 endif
 
 if posix and not darwin
-    sources += files('osdep/timer-linux.c')
+    sources += files('osdep/path-unix.c',
+                     'osdep/timer-linux.c')
 endif
 
 cd_devices = {
diff --git a/options/path.c b/options/path.c
index 504adb7c84c..4dfe36bd2dc 100644
--- a/options/path.c
+++ b/options/path.c
@@ -44,7 +44,9 @@ static const mp_get_platform_path_cb path_resolvers[] = {
 #if HAVE_COCOA
     mp_get_platform_path_osx,
 #endif
-#if !defined(_WIN32) || defined(__CYGWIN__)
+#if HAVE_DARWIN
+    mp_get_platform_path_darwin,
+#elif !defined(_WIN32) || defined(__CYGWIN__)
     mp_get_platform_path_unix,
 #endif
 #if HAVE_UWP
diff --git a/osdep/path-darwin.c b/osdep/path-darwin.c
new file mode 100644
index 00000000000..da8285182d3
--- /dev/null
+++ b/osdep/path-darwin.c
@@ -0,0 +1,66 @@
+/*
+ * This file is part of mpv.
+ *
+ * mpv is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * mpv is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <pthread.h>
+
+#include "options/path.h"
+#include "path.h"
+
+#include "config.h"
+
+static pthread_once_t path_init_once = PTHREAD_ONCE_INIT;
+
+static char mpv_home[512];
+static char old_home[512];
+
+static void path_init(void)
+{
+    char *home = getenv("HOME");
+    char *xdg_dir = getenv("XDG_CONFIG_HOME");
+
+    if (xdg_dir && xdg_dir[0]) {
+        snprintf(mpv_home, sizeof(mpv_home), "%s/mpv", xdg_dir);
+    } else if (home && home[0]) {
+        snprintf(mpv_home, sizeof(mpv_home), "%s/.config/mpv", home);
+    }
+
+    // Maintain compatibility with old ~/.mpv
+    if (home && home[0])
+        snprintf(old_home, sizeof(old_home), "%s/.mpv", home);
+
+    // If the old ~/.mpv exists, and the XDG config dir doesn't, use the old
+    // config dir only.
+    if (mp_path_exists(old_home) && !mp_path_exists(mpv_home)) {
+        snprintf(mpv_home, sizeof(mpv_home), "%s", old_home);
+        old_home[0] = '\0';
+    }
+}
+
+const char *mp_get_platform_path_darwin(void *talloc_ctx, const char *type)
+{
+    pthread_once(&path_init_once, path_init);
+    if (strcmp(type, "home") == 0)
+        return mpv_home;
+    if (strcmp(type, "old_home") == 0)
+        return old_home;
+    if (strcmp(type, "global") == 0)
+        return MPV_CONFDIR;
+    if (strcmp(type, "desktop") == 0)
+        return getenv("HOME");
+    return NULL;
+}
diff --git a/osdep/path.h b/osdep/path.h
index c082c1ee16e..43b9d63bbef 100644
--- a/osdep/path.h
+++ b/osdep/path.h
@@ -16,6 +16,7 @@
 typedef const char *(*mp_get_platform_path_cb)(void *talloc_ctx, const char *type);
 
 // Conforming to mp_get_platform_path_cb.
+const char *mp_get_platform_path_darwin(void *talloc_ctx, const char *type);
 const char *mp_get_platform_path_uwp(void *talloc_ctx, const char *type);
 const char *mp_get_platform_path_win(void *talloc_ctx, const char *type);
 const char *mp_get_platform_path_osx(void *talloc_ctx, const char *type);
diff --git a/wscript b/wscript
index 0c726127d5d..1fb866975ba 100644
--- a/wscript
+++ b/wscript
@@ -160,6 +160,11 @@ main_dependencies = [
         'name': 'posix',
         'desc': 'POSIX environment',
         'func': check_statement(['unistd.h'], 'long x = _POSIX_VERSION'),
+    }, {
+        'name': 'darwin',
+        'desc': 'Darwin environment',
+        'deps': 'os-darwin',
+        'func': check_true,
     }, {
         'name': '--android',
         'desc': 'Android environment',
diff --git a/wscript_build.py b/wscript_build.py
index 4ae1ad3dee5..dbe4caf772e 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -600,8 +600,9 @@ def swift(task):
         ( "osdep/macosx_menubar.m",              "cocoa" ),
         ( "osdep/macosx_touchbar.m",             "macos-touchbar" ),
         ( "osdep/mpv.rc",                        "win32-executable" ),
+        ( "osdep/path-darwin.c",                 "os-darwin"),
         ( "osdep/path-macosx.m",                 "cocoa" ),
-        ( "osdep/path-unix.c"),
+        ( "osdep/path-unix.c",                   "posix && !os-darwin" ),
         ( "osdep/path-uwp.c",                    "uwp" ),
         ( "osdep/path-win.c",                    "win32-desktop" ),
         ( "osdep/semaphore_osx.c" ),

From 21873bdf1f836b2d09a1018cbadea22f00c67af8 Mon Sep 17 00:00:00 2001
From: Dudemanguy <random342@airmail.cc>
Date: Mon, 7 Nov 2022 18:35:43 -0600
Subject: [PATCH 2/4] path: expand internal path selection API to allow for
 additional types

Currently, nothing new is actually implemented but the idea is simply to
just pass a type string all the way up from mp_find_user_file down to
actually getting the platform path. This allows for selecting different
directories besides the user's native config directory. See the next
commit for an implementation.
---
 options/path.c       | 12 ++++++------
 options/path.h       | 13 +++++++------
 player/configfiles.c |  6 +++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/options/path.c b/options/path.c
index 4dfe36bd2dc..bd8adf6d813 100644
--- a/options/path.c
+++ b/options/path.c
@@ -102,15 +102,15 @@ static const char *mp_get_platform_path(void *talloc_ctx,
     return NULL;
 }
 
-char *mp_find_user_config_file(void *talloc_ctx, struct mpv_global *global,
-                               const char *filename)
+char *mp_find_user_file(void *talloc_ctx, struct mpv_global *global,
+                        const char *type, const char *filename)
 {
     void *tmp = talloc_new(NULL);
-    char *res = (char *)mp_get_platform_path(tmp, global, config_dirs[0]);
+    char *res = (char *)mp_get_platform_path(tmp, global, type);
     if (res)
         res = mp_path_join(talloc_ctx, res, filename);
     talloc_free(tmp);
-    MP_DBG(global, "config path: '%s' -> '%s'\n", filename, res ? res : "-");
+    MP_DBG(global, "path: '%s' -> '%s'\n", filename, res ? res : "-");
     return res;
 }
 
@@ -378,9 +378,9 @@ void mp_mkdirp(const char *dir)
     talloc_free(path);
 }
 
-void mp_mk_config_dir(struct mpv_global *global, char *subdir)
+void mp_mk_user_dir(struct mpv_global *global, const char *type, char *subdir)
 {
-    char *dir = mp_find_user_config_file(NULL, global, subdir);
+    char *dir = mp_find_user_file(NULL, global, type, subdir);
     if (dir)
         mp_mkdirp(dir);
     talloc_free(dir);
diff --git a/options/path.h b/options/path.h
index 19f4fb5909c..956936dbe9e 100644
--- a/options/path.h
+++ b/options/path.h
@@ -34,11 +34,12 @@ void mp_init_paths(struct mpv_global *global, struct MPOpts *opts);
 char *mp_find_config_file(void *talloc_ctx, struct mpv_global *global,
                           const char *filename);
 
-// Like mp_find_config_file(), but search only the local writable user config
-// dir. Also, this returns a result even if the file does not exist. Calling
-// it with filename="" is equivalent to retrieving the user config dir.
-char *mp_find_user_config_file(void *talloc_ctx, struct mpv_global *global,
-                               const char *filename);
+// Search for local writable user files within a specific kind of user dir
+// as documented in osdep/path.h. This returns a result even if the file does
+// not exist. Calling it with filename"" is equivalent to retrieving the path
+// to the dir.
+char *mp_find_user_file(void *talloc_ctx, struct mpv_global *global,
+                        const char *type, const char *filename);
 
 // Find all instances of the given config file. Paths are returned in order
 // from lowest to highest priority. filename can contain multiple names
@@ -90,6 +91,6 @@ bool mp_is_url(bstr path);
 bstr mp_split_proto(bstr path, bstr *out_url);
 
 void mp_mkdirp(const char *dir);
-void mp_mk_config_dir(struct mpv_global *global, char *subdir);
+void mp_mk_user_dir(struct mpv_global *global, const char *type, char *subdir);
 
 #endif /* MPLAYER_PATH_H */
diff --git a/player/configfiles.c b/player/configfiles.c
index ce7563995f7..91e74f14b9b 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -64,7 +64,7 @@ void mp_parse_cfgfiles(struct MPContext *mpctx)
 {
     struct MPOpts *opts = mpctx->opts;
 
-    mp_mk_config_dir(mpctx->global, "");
+    mp_mk_user_dir(mpctx->global, "home", "");
 
     char *p1 = mp_get_user_path(NULL, mpctx->global, "~~home/");
     char *p2 = mp_get_user_path(NULL, mpctx->global, "~~old_home/");
@@ -227,7 +227,7 @@ static char *mp_get_playback_resume_config_filename(struct MPContext *mpctx,
 
     if (!mpctx->cached_watch_later_configdir) {
         mpctx->cached_watch_later_configdir =
-            mp_find_user_config_file(mpctx, mpctx->global, MP_WATCH_LATER_CONF);
+            mp_find_user_file(mpctx, mpctx->global, "home", MP_WATCH_LATER_CONF);
     }
 
     if (mpctx->cached_watch_later_configdir)
@@ -293,7 +293,7 @@ void mp_write_watch_later_conf(struct MPContext *mpctx)
     if (!conffile)
         goto exit;
 
-    mp_mk_config_dir(mpctx->global, mpctx->cached_watch_later_configdir);
+    mp_mk_user_dir(mpctx->global, "home", mpctx->cached_watch_later_configdir);
 
     MP_INFO(mpctx, "Saving state.\n");

From 877fd3597c20b81c70314ac200327ddb91f06c5d Mon Sep 17 00:00:00 2001
From: Dudemanguy <random342@airmail.cc>
Date: Mon, 7 Nov 2022 19:01:36 -0600
Subject: [PATCH 3/4] player: use XDG_STATE_HOME for watch_later

A pain point for some users is the fact that watch_later is stored in
the ~/.config directory when it's really not configuration data. Roughly
2 years ago, XDG_STATE_DIR was added to the XDG Base Directory
Specification[0] and its description, user-specific state data, actually
perfectly matches what watch_later data is for. Let's go ahead and use
this directory as the default for watch_later. This change only affects
non-darwin unix-like systems (i.e. Linux, BSDs, etc.). The directory
doesn't move for anyone else.

Internally, quite a few things change with regards to the path
selection. If the --watch-later-directory option is set, internally that
path is saved in global->statedir (analogous to the --config-dir
option). If the platform in question does not have a statedir concept,
then the path selection will simply return "home" instead (old
behavior). Fixes #9147.

[0]: https://gitlab.freedesktop.org/xdg/xdg-specs/-/commit/4f2884e16db35f2962d9b64312917c81be5cb54b
---
 DOCS/interface-changes.rst |  3 +++
 DOCS/man/mpv.rst           |  4 ++-
 DOCS/man/options.rst       |  2 +-
 common/global.h            |  5 +++-
 options/options.c          |  2 +-
 options/path.c             | 55 ++++++++++++++++++++++++++++----------
 osdep/path-unix.c          | 19 ++++++++++---
 osdep/path.h               |  6 +++++
 player/configfiles.c       | 16 +++--------
 9 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index dafd13b7a70..b19d59ebba6 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -50,6 +50,9 @@ Interface changes
     - in wayland, hidpi window scaling now scales the window by the compositor's
       dpi scale factor by default (can be disabled with --no-hidpi-window-scale
       if fractional scaling support exists).
+    - `--save-position-on-quit` and its associated commands now store state files in
+      the XDG_STATE_HOME directory by default. This only has an effect on linux/bsd
+      systems.
  --- mpv 0.35.0 ---
     - add the `--vo=gpu-next` video output driver, as well as the options
       `--allow-delayed-peak-detect`, `--builtin-scalers`,
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index 8ac8ff584ce..ea31a179854 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -461,6 +461,8 @@ Name             Meaning
 ``~~desktop/``   the path to the desktop (win32, macOS)
 ``~~exe_dir/``   win32 only: the path to the directory containing the exe (for
                  config file purposes; ``$MPV_HOME`` overrides it)
+``~~state/``     the path to application state data (``~/.local/state/mpv/``)
+                 On some platforms, this will be the same as ``~~home/``.
 ``~~old_home/``  do not use
 ================ ===============================================================
 
@@ -1586,7 +1588,7 @@ For Windows-specifics, see `FILES ON WINDOWS`_ section.
 
     See `Script location`_ for details.
 
-``~/.config/mpv/watch_later/``
+``~/.local/state/mpv/watch_later/``
     Contains temporary config files needed for resuming playback of files with
     the watch later feature. See for example the ``Q`` key binding, or the
     ``quit-watch-later`` input command.
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 442a7ff3e12..edb7058ac09 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1016,7 +1016,7 @@ Watch Later
     The directory in which to store the "watch later" temporary files.
 
     The default is a subdirectory named "watch_later" underneath the
-    config directory (usually ``~/.config/mpv/``).
+    local state directory (usually ``~/.local/state/mpv/``).
 
 ``--no-resume-playback``
     Do not restore playback position from the ``watch_later`` configuration
diff --git a/common/global.h b/common/global.h
index f95cf28a4d2..136ececb812 100644
--- a/common/global.h
+++ b/common/global.h
@@ -8,8 +8,11 @@ struct mpv_global {
     struct mp_log *log;
     struct m_config_shadow *config;
     struct mp_client_api *client_api;
-    char *configdir;
     struct stats_base *stats;
+
+    bool no_statedir;
+    char *configdir;
+    char *statedir;
 };
 
 #endif
diff --git a/options/options.c b/options/options.c
index dbd2a3f9bda..3837cac5918 100644
--- a/options/options.c
+++ b/options/options.c
@@ -715,7 +715,7 @@ static const m_option_t mp_opts[] = {
     {"ignore-path-in-watch-later-config",
         OPT_FLAG(ignore_path_in_watch_later_config)},
     {"watch-later-directory", OPT_STRING(watch_later_directory),
-        .flags = M_OPT_FILE},
+        .flags = CONF_PRE_PARSE | M_OPT_FILE},
     {"watch-later-options", OPT_STRINGLIST(watch_later_options)},
 
     {"ordered-chapters", OPT_FLAG(ordered_chapters)},
diff --git a/options/path.c b/options/path.c
index bd8adf6d813..3da9ab369a5 100644
--- a/options/path.c
+++ b/options/path.c
@@ -65,19 +65,6 @@ static const char *const config_dirs[] = {
     "global",
 };
 
-void mp_init_paths(struct mpv_global *global, struct MPOpts *opts)
-{
-    TA_FREEP(&global->configdir);
-
-    const char *force_configdir = getenv("MPV_HOME");
-    if (opts->force_configdir && opts->force_configdir[0])
-        force_configdir = opts->force_configdir;
-    if (!opts->load_config)
-        force_configdir = "";
-
-    global->configdir = talloc_strdup(global, force_configdir);
-}
-
 // Return a platform specific path using a path type as defined in osdep/path.h.
 // Keep in mind that the only way to free the return value is freeing talloc_ctx
 // (or its children), as this function can return a statically allocated string.
@@ -87,13 +74,25 @@ static const char *mp_get_platform_path(void *talloc_ctx,
 {
     assert(talloc_ctx);
 
-    if (global->configdir) {
+    bool config_dir = !strcmp(type, "home") || !strcmp(type, "old_home") ||
+                      !strcmp(type, "osxbundle") || !strcmp(type, "exe_dir") ||
+                      !strcmp(type, "global");
+
+    if (global->configdir && config_dir) {
         for (int n = 0; n < MP_ARRAY_SIZE(config_dirs); n++) {
             if (strcmp(config_dirs[n], type) == 0)
                 return (n == 0 && global->configdir[0]) ? global->configdir : NULL;
         }
     }
 
+    if (global->statedir && global->statedir[0] && strcmp(type, "state") == 0)
+        return global->statedir;
+
+    // Return the native config path if the platform doesn't support the
+    // type we are trying to fetch.
+    if (strcmp(type, "state") == 0 && global->no_statedir)
+        type = "home";
+
     for (int n = 0; n < MP_ARRAY_SIZE(path_resolvers); n++) {
         const char *path = path_resolvers[n](talloc_ctx, type);
         if (path && path[0])
@@ -102,6 +101,34 @@ static const char *mp_get_platform_path(void *talloc_ctx,
     return NULL;
 }
 
+void mp_init_paths(struct mpv_global *global, struct MPOpts *opts)
+{
+    TA_FREEP(&global->configdir);
+    TA_FREEP(&global->statedir);
+
+    // Check if the platform has unique directories that differ from
+    // the standard config directory.
+    void *tmp = talloc_new(NULL);
+    const char *state = mp_get_platform_path(tmp, global, "state");
+    if (!state)
+        global->no_statedir = true;
+    talloc_free(tmp);
+
+    const char *force_configdir = getenv("MPV_HOME");
+    const char *force_statedir = "";
+    if (opts->force_configdir && opts->force_configdir[0])
+        force_configdir = opts->force_configdir;
+    if (opts->watch_later_directory && opts->watch_later_directory[0])
+        force_statedir = opts->watch_later_directory;
+    if (!opts->load_config) {
+        force_configdir = "";
+        force_statedir = "";
+    }
+
+    global->configdir = talloc_strdup(global, force_configdir);
+    global->statedir = talloc_strdup(global, force_statedir);
+}
+
 char *mp_find_user_file(void *talloc_ctx, struct mpv_global *global,
                         const char *type, const char *filename)
 {
diff --git a/osdep/path-unix.c b/osdep/path-unix.c
index d9a49ab06d9..34187b430e9 100644
--- a/osdep/path-unix.c
+++ b/osdep/path-unix.c
@@ -27,14 +27,16 @@ static pthread_once_t path_init_once = PTHREAD_ONCE_INIT;
 
 static char mpv_home[512];
 static char old_home[512];
+static char mpv_state[512];
 
 static void path_init(void)
 {
     char *home = getenv("HOME");
-    char *xdg_dir = getenv("XDG_CONFIG_HOME");
+    char *xdg_config = getenv("XDG_CONFIG_HOME");
+    char *xdg_state = getenv("XDG_STATE_HOME");
 
-    if (xdg_dir && xdg_dir[0]) {
-        snprintf(mpv_home, sizeof(mpv_home), "%s/mpv", xdg_dir);
+    if (xdg_config && xdg_config[0]) {
+        snprintf(mpv_home, sizeof(mpv_home), "%s/mpv", xdg_config);
     } else if (home && home[0]) {
         snprintf(mpv_home, sizeof(mpv_home), "%s/.config/mpv", home);
     }
@@ -43,10 +45,17 @@ static void path_init(void)
     if (home && home[0])
         snprintf(old_home, sizeof(old_home), "%s/.mpv", home);
 
+    if (xdg_state && xdg_state[0]) {
+        snprintf(mpv_state, sizeof(mpv_state), "%s/mpv", xdg_state);
+    } else if (home && home[0]) {
+        snprintf(mpv_state, sizeof(mpv_state), "%s/.local/state/mpv", home);
+    }
+
     // If the old ~/.mpv exists, and the XDG config dir doesn't, use the old
-    // config dir only.
+    // config dir only. Also do not use any other XDG directories.
     if (mp_path_exists(old_home) && !mp_path_exists(mpv_home)) {
         snprintf(mpv_home, sizeof(mpv_home), "%s", old_home);
+        snprintf(mpv_state, sizeof(mpv_state), "%s", old_home);
         old_home[0] = '\0';
     }
 }
@@ -58,6 +67,8 @@ const char *mp_get_platform_path_unix(void *talloc_ctx, const char *type)
         return mpv_home;
     if (strcmp(type, "old_home") == 0)
         return old_home;
+    if (strcmp(type, "state") == 0)
+        return mpv_state;
     if (strcmp(type, "global") == 0)
         return MPV_CONFDIR;
     if (strcmp(type, "desktop") == 0)
diff --git a/osdep/path.h b/osdep/path.h
index 43b9d63bbef..d678b12072e 100644
--- a/osdep/path.h
+++ b/osdep/path.h
@@ -11,6 +11,12 @@
 //  "global"        the least priority, global config file location
 //  "desktop"       path to desktop contents
 //
+//  These additional types are also defined. However, they are not necessarily
+//  implemented on every platform. Unlike some other type values that are
+//  platform specific (like "osxbundle"), the value of "home" is returned
+//  instead if these types are not explicitly defined.
+//  "state"         the native mpv-specific user state dir
+//
 // It is allowed to return a static string, so the caller must set talloc_ctx
 // to something other than NULL to avoid memory leaks.
 typedef const char *(*mp_get_platform_path_cb)(void *talloc_ctx, const char *type);
diff --git a/player/configfiles.c b/player/configfiles.c
index 91e74f14b9b..0b8f7c9a9ea 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -217,18 +217,8 @@ static char *mp_get_playback_resume_config_filename(struct MPContext *mpctx,
     for (int i = 0; i < 16; i++)
         conf = talloc_asprintf_append(conf, "%02X", md5[i]);
 
-    if (!mpctx->cached_watch_later_configdir) {
-        char *wl_dir = mpctx->opts->watch_later_directory;
-        if (wl_dir && wl_dir[0]) {
-            mpctx->cached_watch_later_configdir =
-                mp_get_user_path(mpctx, mpctx->global, wl_dir);
-        }
-    }
-
-    if (!mpctx->cached_watch_later_configdir) {
-        mpctx->cached_watch_later_configdir =
-            mp_find_user_file(mpctx, mpctx->global, "home", MP_WATCH_LATER_CONF);
-    }
+    mpctx->cached_watch_later_configdir =
+        mp_find_user_file(mpctx, mpctx->global, "state", MP_WATCH_LATER_CONF);
 
     if (mpctx->cached_watch_later_configdir)
         res = mp_path_join(NULL, mpctx->cached_watch_later_configdir, conf);
@@ -293,7 +283,7 @@ void mp_write_watch_later_conf(struct MPContext *mpctx)
     if (!conffile)
         goto exit;
 
-    mp_mk_user_dir(mpctx->global, "home", mpctx->cached_watch_later_configdir);
+    mp_mk_user_dir(mpctx->global, "state", mpctx->cached_watch_later_configdir);
 
     MP_INFO(mpctx, "Saving state.\n");

From 16c1418139329db4714f76d1bb46be94cf7a46c9 Mon Sep 17 00:00:00 2001
From: Dudemanguy <random342@airmail.cc>
Date: Tue, 15 Nov 2022 08:16:27 -0600
Subject: [PATCH 4/4] player: use XDG_CACHE_HOME by default

This adds cache as a possible path for mpv to interally pick
(~/.cache/mpv for non-darwin unix-like systems, the usual config
directory for everyone else). Internally, --cache-dir has been reworked
to be a singular, global option that controls where mpv may put any
cache. This means --gpu-shader-cache-dir and --icc-cache-dir are both
obsolete options now (they just map to --cache-dir). This is essentially
the same as --config-dir but instead for --cache-dir (to force a
specific directory for only cache files). If --cache-dir isn't set, then
the cache directory is XDG_CACHE_HOME. This does mean that it is no
longer possible to have separate directories for the different kinds of
cache files mpv can create (demuxer cache, gpu shader cache, and icc
cache), but most likely nobody seriously does that. Cache is cache and
it makes more sense for it to be in one directory and controlled by the
same option.
---
 DOCS/interface-changes.rst   |  7 +++++++
 DOCS/man/mpv.rst             |  2 ++
 DOCS/man/options.rst         | 25 ++++++++++++-------------
 common/global.h              |  2 ++
 demux/cache.c                | 10 +++-------
 options/options.c            |  2 ++
 options/options.h            |  1 +
 options/path.c               | 14 ++++++++++++++
 osdep/path-unix.c            | 11 +++++++++++
 osdep/path.h                 |  1 +
 video/out/gpu/lcms.c         |  8 ++++----
 video/out/gpu/lcms.h         |  1 +
 video/out/gpu/shader_cache.c |  6 ++++--
 video/out/gpu/shader_cache.h |  2 +-
 video/out/gpu/video.c        |  8 +++++---
 video/out/gpu/video.h        |  1 +
 video/out/vo_gpu_next.c      |  8 ++++----
 17 files changed, 75 insertions(+), 34 deletions(-)

diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index b19d59ebba6..d6b944e6b31 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -53,6 +53,13 @@ Interface changes
     - `--save-position-on-quit` and its associated commands now store state files in
       the XDG_STATE_HOME directory by default. This only has an effect on linux/bsd
       systems.
+    - add `--icc-cache` and `--gpu-shader-cache` options
+    - mpv now implictly saves cache files in XDG_CACHE_HOME by default. This only has
+      an effect if the user enables options that would lead to cache being stored.
+    - ``--cache-dir`` now controls the location of the cache directory for all
+      mpv-related cache (demuxer cache, gpu shader cache, and icc cache).
+    - deprecate ``--icc-cache-dir`` and alias it to ``--cache-dir``
+    - deprecate ``--gpu-shader-cache-dir`` and alias it to ``--cache-dir``
  --- mpv 0.35.0 ---
     - add the `--vo=gpu-next` video output driver, as well as the options
       `--allow-delayed-peak-detect`, `--builtin-scalers`,
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index ea31a179854..0eb28ca4455 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -461,6 +461,8 @@ Name             Meaning
 ``~~desktop/``   the path to the desktop (win32, macOS)
 ``~~exe_dir/``   win32 only: the path to the directory containing the exe (for
                  config file purposes; ``$MPV_HOME`` overrides it)
+``~~cache/``     the path to application cache data (``~/.cache/mpv/``)
+                 On some platforms, this will be the same as ``~~home/``.
 ``~~state/``     the path to application state data (``~/.local/state/mpv/``)
                  On some platforms, this will be the same as ``~~home/``.
 ``~~old_home/``  do not use
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index edb7058ac09..84ee54ace67 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -4752,8 +4752,6 @@ Cache
     This makes sense only with ``--cache``. If the normal cache is disabled,
     this option is ignored.
 
-    You need to set ``--cache-dir`` to use this.
-
     The cache file is append-only. Even if the player appears to prune data, the
     file space freed by it is not reused. The cache file is deleted when
     playback is closed.
@@ -4776,9 +4774,9 @@ Cache
     continue to use the cache file that was opened first.
 
 ``--cache-dir=<path>``
-    Directory where to create temporary files (default: none).
-
-    Currently, this is used for ``--cache-on-disk`` only.
+    Directory where to create temporary files (usually ``~/.cache/mpv``).
+    This is used for ``--cache-on-disk``, ``--icc-cache``, and
+    ``--gpu-shader-cache``.
 
 ``--cache-pause=<yes|no>``
     Whether the player should automatically pause when the cache runs out of
@@ -6594,11 +6592,12 @@ them.
     Applications using libmpv with the render API need to provide the ICC
     profile via ``MPV_RENDER_PARAM_ICC_PROFILE``.
 
-``--icc-cache-dir=<dirname>``
-    Store and load the 3D LUTs created from the ICC profile in this directory.
-    This can be used to speed up loading, since LittleCMS 2 can take a while to
-    create a 3D LUT. Note that these files contain uncompressed LUTs. Their
-    size depends on the ``--icc-3dlut-size``, and can be very big.
+``--icc-cache``
+    Store and load 3D LUTs created from the ICC profile on disk in the
+    cache directory. This can be used to speed up loading, since LittleCMS
+    2 can take a while to create a 3D LUT. Note that these files contain
+    uncompressed LUTs. Their size depends on the ``--icc-3dlut-size``, and
+    can be very big.
 
     NOTE: This is not cleaned automatically, so old, unused cache files may
     stick around indefinitely.
@@ -6735,9 +6734,9 @@ them.
 
     This option might be silently removed in the future.
 
-``--gpu-shader-cache-dir=<dirname>``
-    Store and load compiled GLSL shaders in this directory. Normally, shader
-    compilation is very fast, so this is usually not needed. It mostly matters
+``--gpu-shader-cache``
+    Store and load compiled GLSL shaders in the cache directory. Normally, shader
+    compilation is very fast, so this is not usually needed. It mostly matters
     for GPU APIs that require internally recompiling shaders to other languages,
     for example anything based on ANGLE or Vulkan. Enabling this can improve
     startup performance on these platforms.
diff --git a/common/global.h b/common/global.h
index 136ececb812..15891a934da 100644
--- a/common/global.h
+++ b/common/global.h
@@ -10,7 +10,9 @@ struct mpv_global {
     struct mp_client_api *client_api;
     struct stats_base *stats;
 
+    bool no_cachedir;
     bool no_statedir;
+    char *cachedir;
     char *configdir;
     char *statedir;
 };
diff --git a/demux/cache.c b/demux/cache.c
index f48598807ce..8466861fdd5 100644
--- a/demux/cache.c
+++ b/demux/cache.c
@@ -32,7 +32,6 @@
 #include "osdep/io.h"
 
 struct demux_cache_opts {
-    char *cache_dir;
     int unlink_files;
 };
 
@@ -40,7 +39,6 @@ struct demux_cache_opts {
 
 const struct m_sub_options demux_cache_conf = {
     .opts = (const struct m_option[]){
-        {"cache-dir", OPT_STRING(cache_dir), .flags = M_OPT_FILE},
         {"cache-unlink-files", OPT_CHOICE(unlink_files,
             {"immediate", 2}, {"whendone", 1}, {"no", 0}),
         },
@@ -99,11 +97,9 @@ struct demux_cache *demux_cache_create(struct mpv_global *global,
     cache->log = log;
     cache->fd = -1;
 
-    char *cache_dir = cache->opts->cache_dir;
-    if (!(cache_dir && cache_dir[0])) {
-        MP_ERR(cache, "No cache data directory supplied.\n");
-        goto fail;
-    }
+    char *cache_dir = mp_find_user_file(NULL, global, "cache", "");
+    if (cache_dir && cache_dir[0])
+        mp_mkdirp(cache_dir);
 
     cache->filename = mp_path_join(cache, cache_dir, "mpv-cache-XXXXXX.dat");
     cache->fd = mp_mkostemps(cache->filename, 4, O_CLOEXEC);
diff --git a/options/options.c b/options/options.c
index 3837cac5918..5aa7dc631a0 100644
--- a/options/options.c
+++ b/options/options.c
@@ -442,6 +442,8 @@ static const m_option_t mp_opts[] = {
     {"config", OPT_FLAG(load_config), .flags = CONF_PRE_PARSE},
     {"config-dir", OPT_STRING(force_configdir),
         .flags = CONF_NOCFG | CONF_PRE_PARSE | M_OPT_FILE},
+    {"cache-dir", OPT_STRING(force_cachedir),
+        .flags = CONF_PRE_PARSE | M_OPT_FILE},
     {"reset-on-next-file", OPT_STRINGLIST(reset_options)},
 
 #if HAVE_LUA || HAVE_JAVASCRIPT
diff --git a/options/options.h b/options/options.h
index 86e95dc826a..220b4327678 100644
--- a/options/options.h
+++ b/options/options.h
@@ -212,6 +212,7 @@ typedef struct MPOpts {
     int quiet;
     int load_config;
     char *force_configdir;
+    char *force_cachedir;
     int use_filedir_conf;
     int hls_bitrate;
     int edition_id;
diff --git a/options/path.c b/options/path.c
index 3da9ab369a5..a2368cfd4d1 100644
--- a/options/path.c
+++ b/options/path.c
@@ -85,11 +85,16 @@ static const char *mp_get_platform_path(void *talloc_ctx,
         }
     }
 
+    if (global->cachedir && global->cachedir[0] && strcmp(type, "cache") == 0)
+        return global->cachedir;
+
     if (global->statedir && global->statedir[0] && strcmp(type, "state") == 0)
         return global->statedir;
 
     // Return the native config path if the platform doesn't support the
     // type we are trying to fetch.
+    if (strcmp(type, "cache") == 0 && global->no_cachedir)
+        type = "home";
     if (strcmp(type, "state") == 0 && global->no_statedir)
         type = "home";
 
@@ -104,28 +109,37 @@ static const char *mp_get_platform_path(void *talloc_ctx,
 void mp_init_paths(struct mpv_global *global, struct MPOpts *opts)
 {
     TA_FREEP(&global->configdir);
+    TA_FREEP(&global->cachedir);
     TA_FREEP(&global->statedir);
 
     // Check if the platform has unique directories that differ from
     // the standard config directory.
     void *tmp = talloc_new(NULL);
+    const char *cache = mp_get_platform_path(tmp, global, "cache");
     const char *state = mp_get_platform_path(tmp, global, "state");
+    if (!cache)
+        global->no_cachedir = true;
     if (!state)
         global->no_statedir = true;
     talloc_free(tmp);
 
     const char *force_configdir = getenv("MPV_HOME");
+    const char *force_cachedir = "";
     const char *force_statedir = "";
     if (opts->force_configdir && opts->force_configdir[0])
         force_configdir = opts->force_configdir;
+    if (opts->force_cachedir && opts->force_cachedir[0])
+        force_cachedir = opts->force_cachedir;
     if (opts->watch_later_directory && opts->watch_later_directory[0])
         force_statedir = opts->watch_later_directory;
     if (!opts->load_config) {
         force_configdir = "";
+        force_cachedir = "";
         force_statedir = "";
     }
 
     global->configdir = talloc_strdup(global, force_configdir);
+    global->cachedir = talloc_strdup(global, force_cachedir);
     global->statedir = talloc_strdup(global, force_statedir);
 }
 
diff --git a/osdep/path-unix.c b/osdep/path-unix.c
index 34187b430e9..5dc5cb2836e 100644
--- a/osdep/path-unix.c
+++ b/osdep/path-unix.c
@@ -27,11 +27,13 @@ static pthread_once_t path_init_once = PTHREAD_ONCE_INIT;
 
 static char mpv_home[512];
 static char old_home[512];
+static char mpv_cache[512];
 static char mpv_state[512];
 
 static void path_init(void)
 {
     char *home = getenv("HOME");
+    char *xdg_cache = getenv("XDG_CACHE_HOME");
     char *xdg_config = getenv("XDG_CONFIG_HOME");
     char *xdg_state = getenv("XDG_STATE_HOME");
 
@@ -45,6 +47,12 @@ static void path_init(void)
     if (home && home[0])
         snprintf(old_home, sizeof(old_home), "%s/.mpv", home);
 
+    if (xdg_cache && xdg_cache[0]) {
+        snprintf(mpv_cache, sizeof(mpv_cache), "%s/mpv", xdg_cache);
+    } else if (home && home[0]) {
+        snprintf(mpv_cache, sizeof(mpv_cache), "%s/.cache/mpv", home);
+    }
+
     if (xdg_state && xdg_state[0]) {
         snprintf(mpv_state, sizeof(mpv_state), "%s/mpv", xdg_state);
     } else if (home && home[0]) {
@@ -55,6 +63,7 @@ static void path_init(void)
     // config dir only. Also do not use any other XDG directories.
     if (mp_path_exists(old_home) && !mp_path_exists(mpv_home)) {
         snprintf(mpv_home, sizeof(mpv_home), "%s", old_home);
+        snprintf(mpv_cache, sizeof(mpv_cache), "%s", old_home);
         snprintf(mpv_state, sizeof(mpv_state), "%s", old_home);
         old_home[0] = '\0';
     }
@@ -67,6 +76,8 @@ const char *mp_get_platform_path_unix(void *talloc_ctx, const char *type)
         return mpv_home;
     if (strcmp(type, "old_home") == 0)
         return old_home;
+    if (strcmp(type, "cache") == 0)
+        return mpv_cache;
     if (strcmp(type, "state") == 0)
         return mpv_state;
     if (strcmp(type, "global") == 0)
diff --git a/osdep/path.h b/osdep/path.h
index d678b12072e..2c00ea56ebb 100644
--- a/osdep/path.h
+++ b/osdep/path.h
@@ -15,6 +15,7 @@
 //  implemented on every platform. Unlike some other type values that are
 //  platform specific (like "osxbundle"), the value of "home" is returned
 //  instead if these types are not explicitly defined.
+//  "cache"         the native mpv-specific user cache dir
 //  "state"         the native mpv-specific user state dir
 //
 // It is allowed to return a static string, so the caller must set talloc_ctx
diff --git a/video/out/gpu/lcms.c b/video/out/gpu/lcms.c
index 3df5eba5f21..7a9f99e259f 100644
--- a/video/out/gpu/lcms.c
+++ b/video/out/gpu/lcms.c
@@ -332,7 +332,7 @@ bool gl_lcms_get_lut3d(struct gl_lcms *p, struct lut3d **result_lut3d,
     cmsContext cms = NULL;
 
     char *cache_file = NULL;
-    if (p->opts->cache_dir && p->opts->cache_dir[0]) {
+    if (p->opts->cache) {
         // Gamma is included in the header to help uniquely identify it,
         // because we may change the parameter in the future or make it
         // customizable, same for the primaries.
@@ -352,7 +352,7 @@ bool gl_lcms_get_lut3d(struct gl_lcms *p, struct lut3d **result_lut3d,
         av_sha_final(sha, hash);
         av_free(sha);
 
-        char *cache_dir = mp_get_user_path(tmp, p->global, p->opts->cache_dir);
+        char *cache_dir = mp_find_user_file(NULL, p->global, "cache", "");
         cache_file = talloc_strdup(tmp, "");
         for (int i = 0; i < sizeof(hash); i++)
             cache_file = talloc_asprintf_append(cache_file, "%02X", hash[i]);
@@ -494,13 +494,13 @@ const struct m_sub_options mp_icc_conf = {
         {"use-embedded-icc-profile", OPT_FLAG(use_embedded)},
         {"icc-profile", OPT_STRING(profile), .flags = M_OPT_FILE},
         {"icc-profile-auto", OPT_FLAG(profile_auto)},
-        {"icc-cache-dir", OPT_STRING(cache_dir), .flags = M_OPT_FILE},
+        {"icc-cache", OPT_FLAG(cache)},
         {"icc-intent", OPT_INT(intent)},
         {"icc-force-contrast", OPT_CHOICE(contrast, {"no", 0}, {"inf", -1}),
             M_RANGE(0, 1000000)},
         {"icc-3dlut-size", OPT_STRING_VALIDATE(size_str, validate_3dlut_size_opt)},
         {"3dlut-size", OPT_REPLACED("icc-3dlut-size")},
-        {"icc-cache", OPT_REMOVED("see icc-cache-dir")},
+        {"icc-cache-dir", OPT_REPLACED("cache-dir")},
         {"icc-contrast", OPT_REMOVED("see icc-force-contrast")},
         {0}
     },
diff --git a/video/out/gpu/lcms.h b/video/out/gpu/lcms.h
index 62b24371947..7a92098cb77 100644
--- a/video/out/gpu/lcms.h
+++ b/video/out/gpu/lcms.h
@@ -13,6 +13,7 @@ struct mp_icc_opts {
     int use_embedded;
     char *profile;
     int profile_auto;
+    int cache;
     char *cache_dir;
     char *size_str;
     int intent;
diff --git a/video/out/gpu/shader_cache.c b/video/out/gpu/shader_cache.c
index 302508b5433..22de132448f 100644
--- a/video/out/gpu/shader_cache.c
+++ b/video/out/gpu/shader_cache.c
@@ -557,10 +557,12 @@ static void update_uniform(struct gl_shader_cache *sc, struct sc_entry *e,
     }
 }
 
-void gl_sc_set_cache_dir(struct gl_shader_cache *sc, const char *dir)
+void gl_sc_set_cache_dir(struct gl_shader_cache *sc)
 {
     talloc_free(sc->cache_dir);
-    sc->cache_dir = talloc_strdup(sc, dir);
+    char *cache_dir = mp_find_user_file(NULL, sc->global, "cache", "");
+    mp_mkdirp(cache_dir);
+    sc->cache_dir = talloc_strdup(sc, cache_dir);
 }
 
 static bool create_pass(struct gl_shader_cache *sc, struct sc_entry *entry)
diff --git a/video/out/gpu/shader_cache.h b/video/out/gpu/shader_cache.h
index 3c87513b2b5..683c7e28597 100644
--- a/video/out/gpu/shader_cache.h
+++ b/video/out/gpu/shader_cache.h
@@ -63,4 +63,4 @@ struct mp_pass_perf gl_sc_dispatch_compute(struct gl_shader_cache *sc,
 // The application can call this on errors, to reset the current shader. This
 // is normally done implicitly by gl_sc_dispatch_*
 void gl_sc_reset(struct gl_shader_cache *sc);
-void gl_sc_set_cache_dir(struct gl_shader_cache *sc, const char *dir);
+void gl_sc_set_cache_dir(struct gl_shader_cache *sc);
diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
index c35372d69e7..57cff65f202 100644
--- a/video/out/gpu/video.c
+++ b/video/out/gpu/video.c
@@ -462,15 +462,16 @@ const struct m_sub_options gl_video_conf = {
         {"gpu-tex-pad-x", OPT_INT(tex_pad_x), M_RANGE(0, 4096)},
         {"gpu-tex-pad-y", OPT_INT(tex_pad_y), M_RANGE(0, 4096)},
         {"", OPT_SUBSTRUCT(icc_opts, mp_icc_conf)},
-        {"gpu-shader-cache-dir", OPT_STRING(shader_cache_dir), .flags = M_OPT_FILE},
+        {"gpu-shader-cache", OPT_FLAG(shader_cache)},
         {"gpu-hwdec-interop",
             OPT_STRING_VALIDATE(hwdec_interop, ra_hwdec_validate_opt)},
+        {"gpu-shader-cache-dir", OPT_REPLACED("cache-dir")},
         {"opengl-hwdec-interop", OPT_REPLACED("gpu-hwdec-interop")},
         {"hwdec-preload", OPT_REPLACED("opengl-hwdec-interop")},
         {"hdr-tone-mapping", OPT_REPLACED("tone-mapping")},
         {"opengl-shaders", OPT_REPLACED("glsl-shaders")},
         {"opengl-shader", OPT_REPLACED("glsl-shader")},
-        {"opengl-shader-cache-dir", OPT_REPLACED("gpu-shader-cache-dir")},
+        {"opengl-shader-cache-dir", OPT_REPLACED("cache-dir")},
         {"opengl-tex-pad-x", OPT_REPLACED("gpu-tex-pad-x")},
         {"opengl-tex-pad-y", OPT_REPLACED("gpu-tex-pad-y")},
         {"opengl-fbo-format", OPT_REPLACED("fbo-format")},
@@ -4086,7 +4087,8 @@ static void reinit_from_options(struct gl_video *p)
 
     check_gl_features(p);
     uninit_rendering(p);
-    gl_sc_set_cache_dir(p->sc, p->opts.shader_cache_dir);
+    if (p->opts.shader_cache)
+        gl_sc_set_cache_dir(p->sc);
     p->ra->use_pbo = p->opts.pbo;
     gl_video_setup_hooks(p);
     reinit_osd(p);
diff --git a/video/out/gpu/video.h b/video/out/gpu/video.h
index b7f6e6b4855..296a5761a06 100644
--- a/video/out/gpu/video.h
+++ b/video/out/gpu/video.h
@@ -169,6 +169,7 @@ struct gl_video_opts {
     int tex_pad_x, tex_pad_y;
     struct mp_icc_opts *icc_opts;
     int early_flush;
+    int shader_cache;
     char *shader_cache_dir;
     char *hwdec_interop;
 };
diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c
index 8cb05d77047..57d6c66cae4 100644
--- a/video/out/vo_gpu_next.c
+++ b/video/out/vo_gpu_next.c
@@ -1335,10 +1335,10 @@ static void wait_events(struct vo *vo, int64_t until_time_us)
 static char *get_cache_file(struct priv *p)
 {
     struct gl_video_opts *opts = p->opts_cache->opts;
-    if (!opts->shader_cache_dir || !opts->shader_cache_dir[0])
+    if (!opts->shader_cache)
         return NULL;
 
-    char *dir = mp_get_user_path(NULL, p->global, opts->shader_cache_dir);
+    char *dir = mp_find_user_file(NULL, p->global, "cache", "");
     char *file = mp_path_join(NULL, dir, "libplacebo.cache");
     mp_mkdirp(dir);
     talloc_free(dir);
@@ -1562,7 +1562,7 @@ static const struct pl_hook *load_hook(struct priv *p, const char *path)
 static stream_t *icc_open_cache(struct priv *p, uint64_t sig, int flags)
 {
     const struct gl_video_opts *opts = p->opts_cache->opts;
-    if (!opts->icc_opts->cache_dir || !opts->icc_opts->cache_dir[0])
+    if (!opts->icc_opts->cache)
         return NULL;
 
     char cache_name[16+1];
@@ -1572,7 +1572,7 @@ static stream_t *icc_open_cache(struct priv *p, uint64_t sig, int flags)
     }
     cache_name[16] = '\0';
 
-    char *cache_dir = mp_get_user_path(NULL, p->global, opts->icc_opts->cache_dir);
+    char *cache_dir = mp_find_user_file(NULL, p->global, "cache", "");
     char *path = mp_path_join(NULL, cache_dir, cache_name);
 
     stream_t *stream = NULL;

Places

File mpv_PR10838.patch of Package mpv (Revision 0e8e997312331524a1cc9bebec1e9545)

Places