openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File mpv_PR8024.patch of Package mpv (Revision 461183a1e56cc62a9dd19b0935bf48b0)

Currently displaying revision 461183a1e56cc62a9dd19b0935bf48b0 , Show latest

From 1bb7d50a99f6f7f02c091fb5e48772683d602bd3 Mon Sep 17 00:00:00 2001
From: LaserEyess <lasereyess@users.noreply.github.com>
Date: Sun, 23 Aug 2020 12:26:45 -0400
Subject: [PATCH] osdep: add compile time option to default to xdg

This commit adds a `--enable-xdg` configure flag that will switch
the order mpv looks for configurations by default. Instead of
looking in `$HOME/.mpv` first, it will check `$XDG_CONFIG_DIR/mpv`.

This is disabled by default.
---
 osdep/path-unix.c | 31 ++++++++++++++++++++++---------
 wscript           |  5 +++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/osdep/path-unix.c b/osdep/path-unix.c
index 4a79a1838e..8b461677d1 100644
--- a/osdep/path-unix.c
+++ b/osdep/path-unix.c
@@ -28,26 +28,39 @@ static pthread_once_t path_init_once = PTHREAD_ONCE_INIT;
 static char mpv_home[512];
 static char old_home[512];
 
+static void copy_paths(char *default_path, const int size, char *compat_path)
+{
+    // If the compat. dir exists, and the proper dir doesn't, use the compat.
+    // config dir only.
+    if (mp_path_exists(compat_path) && !mp_path_exists(default_path)) {
+        snprintf(default_path, size, "%s", compat_path);
+        compat_path[0] = '\0';
+    }
+
+    snprintf(mpv_home, sizeof(mpv_home), "%s", default_path);
+    snprintf(old_home, sizeof(old_home), "%s", compat_path);
+}
+
 static void path_init(void)
 {
+    char xdg_home[512];
+    char dot_home[512];
     char *home = getenv("HOME");
     char *xdg_dir = getenv("XDG_CONFIG_HOME");
 
     if (home && home[0])
-        snprintf(mpv_home, sizeof(mpv_home), "%s/.mpv", home);
+        snprintf(dot_home, sizeof(dot_home), "%s/.mpv", home);
 
-    // Maintain compatibility with old XDG config dirs
     if (xdg_dir && xdg_dir[0]) {
-        snprintf(old_home, sizeof(old_home), "%s/mpv", xdg_dir);
+        snprintf(xdg_home, sizeof(xdg_home), "%s/mpv", xdg_dir);
     } else if (home && home[0]) {
-        snprintf(old_home, sizeof(old_home), "%s/.config/mpv", home);
+        snprintf(xdg_home, sizeof(xdg_home), "%s/.config/mpv", home);
     }
 
-    // If the compat. dir exists, and the proper dir doesn't, use the compat.
-    // 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';
+    if (HAVE_XDG) {
+        copy_paths(xdg_home, sizeof(xdg_home), dot_home);
+    } else {
+        copy_paths(dot_home, sizeof(dot_home), xdg_home);
     }
 }
 
diff --git a/wscript b/wscript
index a54a1191dd..a5ee18338d 100644
--- a/wscript
+++ b/wscript
@@ -829,6 +829,11 @@ standalone_features = [
         'desc': 'macOS libmpv backend',
         'deps': 'cocoa && swift',
         'func': check_true
+    }, {
+        'name': '--xdg',
+        'desc': 'xdg basedir specification config support as default',
+        'default': 'disable',
+        'func': check_true,
     }
 ]

Places

File mpv_PR8024.patch of Package mpv (Revision 461183a1e56cc62a9dd19b0935bf48b0)

Places