Bug#1119287: trixie-pu: package mpv/0.40.0-3+deb13u1

[Sebastian Ramacher <sramacher@debian.org>]

Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: mpv@packages.debian.org, sramacher@debian.org
Control: affects -1 + src:mpv
User: release.debian.org@packages.debian.org
Usertags: pu

[ Reason ]
This update fixes #1115938 which is only a minor annoyance but easy
enough to fix. The patch creates the requires directories if they do not
already exist.

[ Impact ]
Users have to create the directory themselves.

[ Tests ]
Upstream patch works according to the reporter.

[ Risks ]
None

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Other info ]
Changes are already uploaded to pu

Cheers
-- 
Sebastian Ramacher

diff --git a/debian/changelog b/debian/changelog
index dfaea9bb2a..ab7d3a48e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mpv (0.40.0-3+deb13u1) trixie; urgency=medium
+
+  * debian/gbp.conf: Work on debian/trixie branch
+  * debian/patches: Create missing folders for watch history (Closes: #1115938)
+
+ -- Sebastian Ramacher <sramacher@debian.org>  Tue, 28 Oct 2025 19:31:12 +0100
+
 mpv (0.40.0-3) unstable; urgency=medium
 
   [ Diederik de Haas ]
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 48731a6968..d26cb50d34 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/master
+debian-branch = debian/trixie
 upstream-branch = upstream/latest
diff --git a/debian/patches/0001-player-create-missing-folders-for-watch-history-path.patch b/debian/patches/0001-player-create-missing-folders-for-watch-history-path.patch
new file mode 100644
index 0000000000..02e5f4eaef
--- /dev/null
+++ b/debian/patches/0001-player-create-missing-folders-for-watch-history-path.patch
@@ -0,0 +1,27 @@
+From: sfan5 <sfan5@live.de>
+Date: Sun, 1 Jun 2025 17:36:44 +0200
+Subject: player: create missing folders for watch-history-path
+
+fixes: #16357
+---
+ player/loadfile.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/player/loadfile.c b/player/loadfile.c
+index b6b71fd..96c0fc4 100644
+--- a/player/loadfile.c
++++ b/player/loadfile.c
+@@ -1546,8 +1546,12 @@ static void append_to_watch_history(struct MPContext *mpctx)
+     void *ctx = talloc_new(NULL);
+     char *history_path = mp_get_user_path(ctx, mpctx->global,
+                                           mpctx->opts->watch_history_path);
+-    FILE *history_file = fopen(history_path, "ab");
++    char *history_path_dir = bstrto0(ctx, mp_dirname(history_path));
++    if (!mp_path_exists(history_path_dir)) {
++        mp_mkdirp(history_path_dir);
++    }
+ 
++    FILE *history_file = fopen(history_path, "ab");
+     if (!history_file) {
+         MP_ERR(mpctx, "Failed to open history file: %s\n",
+                mp_strerror(errno));
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000000..7f8ec006cb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-player-create-missing-folders-for-watch-history-path.patch