Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (7fb97514adffdf7eb7bc92ee7d1356fca1f40438)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (7fb97514adffdf7eb7bc92ee7d1356fca1f40438)
  • Date: Wed, 12 Jul 2023 03:53:21 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

video/mpv/HISTORY
| 6 +
video/mpv/PRE_BUILD
| 4

video/mpv/patches-stable/0001-vo_gpu_next-compatibility-with-libplacebo-v6.265.patch
| 50 ++++++++++
3 files changed, 60 insertions(+)

New commits:
commit 7fb97514adffdf7eb7bc92ee7d1356fca1f40438
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

video/mpv: backported upstream patch to stable
to fix compilation errors when built
with libplacebo >= 6.265

diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index 8cd1a5e..769aa2b 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,9 @@
+2023-07-11 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD,
+
patches-stable/0001-vo_gpu_next-compatibility-with-libplacebo-v6.265.patch:
+ added upstream patch to stable branch fix compilation errors with
+ libplacebo >= 6.265
+
2023-01-28 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.35.1

diff --git a/video/mpv/PRE_BUILD b/video/mpv/PRE_BUILD
new file mode 100755
index 0000000..f869ef9
--- /dev/null
+++ b/video/mpv/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir "patches-${MPV_BRANCH}"
diff --git
a/video/mpv/patches-stable/0001-vo_gpu_next-compatibility-with-libplacebo-v6.265.patch

b/video/mpv/patches-stable/0001-vo_gpu_next-compatibility-with-libplacebo-v6.265.patch
new file mode 100644
index 0000000..bf2f786
--- /dev/null
+++
b/video/mpv/patches-stable/0001-vo_gpu_next-compatibility-with-libplacebo-v6.265.patch
@@ -0,0 +1,50 @@
+From 3a2f8d42ab203c961e50ce198ca4eb232de3819a Mon Sep 17 00:00:00 2001
+From: llyyr <llyyr.public AT gmail.com>
+Date: Tue, 14 Mar 2023 00:25:04 +0530
+Subject: [PATCH] vo_gpu_next: compatibility with libplacebo v6.265
+
+libplacebo v6.265.0 removed v4 deprecations. We already require
+PL_API_VER >= 202, so we don't need to wrap
+pl_tex_transfer_params.row_pitch around a conditional, which exists
+since PL_API_VER >= 168. However, pl_source_frame.duration does not exist
until
+PL_API_VER >= 219, so we should use a conditional directive.
+---
+ video/out/vo_gpu_next.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c
+index 7ed01d5216..569ea373c8 100644
+--- a/video/out/vo_gpu_next.c
++++ b/video/out/vo_gpu_next.c
+@@ -265,7 +265,7 @@ static void update_overlays(struct vo *vo, struct
mp_osd_res res, double pts,
+ ok = pl_tex_upload(p->gpu, &(struct pl_tex_transfer_params) {
+ .tex = entry->tex,
+ .rc = { .x1 = item->packed_w, .y1 = item->packed_h, },
+- .stride_w = item->packed->stride[0] / tex_fmt->texel_size,
++ .row_pitch = item->packed->stride[0],
+ .ptr = item->packed->planes[0],
+ });
+ if (!ok) {
+@@ -882,6 +882,9 @@ static void draw_frame(struct vo *vo, struct vo_frame
*frame)
+
+ pl_queue_push(p->queue, &(struct pl_source_frame) {
+ .pts = mpi->pts,
++#if PL_API_VER >= 219
++ .duration = frame->ideal_frame_duration,
++#endif
+ .frame_data = mpi,
+ .map = map_frame,
+ .unmap = unmap_frame,
+@@ -939,7 +942,9 @@ static void draw_frame(struct vo *vo, struct vo_frame
*frame)
+ .pts = frame->current->pts + vsync_offset,
+ .radius = pl_frame_mix_radius(&p->params),
+ .vsync_duration = frame->vsync_interval,
++#if PL_API_VER < 219
+ .frame_duration = frame->ideal_frame_duration,
++#endif
+ .interpolation_threshold = opts->interpolation_threshold,
+ };
+
+--
+2.41.0
+



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (7fb97514adffdf7eb7bc92ee7d1356fca1f40438), Pavel Vinogradov, 07/11/2023

Archive powered by MHonArc 2.6.24.

Top of Page