Skip to Content.
Sympa Menu

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

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 (8068feffd6fbddc5c8617f420c0846d08606aa75)
  • Date: Mon, 24 Jul 2023 03:02:22 +0000

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

video/mpv/DETAILS
| 5 -
video/mpv/HISTORY
| 6 +
video/mpv/PRE_BUILD
| 4

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

New commits:
commit 8068feffd6fbddc5c8617f420c0846d08606aa75
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

video/mpv: version 0.36.0

diff --git a/video/mpv/DETAILS b/video/mpv/DETAILS
index eea4283..a112bce 100755
--- a/video/mpv/DETAILS
+++ b/video/mpv/DETAILS
@@ -9,11 +9,12 @@ if [[ "${MPV_BRANCH}" == "scm" ]]; then
SOURCE_IGNORE="volatile"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
else
- VERSION="0.35.1"
-
SOURCE_HASH="sha512:42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b445799998def0919fb13fce8b8f6453f82652d5bfaea5929119127a"
+ VERSION="0.36.0"
+
SOURCE_HASH="sha512:51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f"
SECURITY_PATCH="3"
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]="https://github.com/${SPELL}-player/${SPELL}/archive/v${VERSION}.tar.gz";
+# Watch: https://github.com/mpv-player/mpv/tags tags/v([0-9.]+)[.]tar
SOURCE_HINTS="no-check-certificate"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
fi
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index 769aa2b..3b96edc 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,9 @@
+2023-07-23 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.36.0, added Watch line
+ * PRE_BUILD,
+
patches-stable/0001-vo_gpu_next-compatibility-with-libplacebo-v6.265.patch:
+ removed, no longer needed
+
2023-07-11 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD,

patches-stable/0001-vo_gpu_next-compatibility-with-libplacebo-v6.265.patch:
diff --git a/video/mpv/PRE_BUILD b/video/mpv/PRE_BUILD
deleted file mode 100755
index f869ef9..0000000
--- a/video/mpv/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index bf2f786..0000000
---
a/video/mpv/patches-stable/0001-vo_gpu_next-compatibility-with-libplacebo-v6.265.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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 (8068feffd6fbddc5c8617f420c0846d08606aa75), Pavel Vinogradov, 07/23/2023

Archive powered by MHonArc 2.6.24.

Top of Page