Re: [PR PATCH] [Updated] mpv-0.35.0

[abenson <abenson@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 478 bytes --]

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages mpv_0.35.0
https://github.com/void-linux/void-packages/pull/40497

mpv-0.35.0
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86-64

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/40497.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mpv_0.35.0-40497.patch --]
[-- Type: text/x-diff, Size: 30708 bytes --]

From 85983ca8e1a04658160769239599d4081315040b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 12 Nov 2022 16:06:05 -0600
Subject: [PATCH 1/8] mpv: update to 0.35.0.

---
 common/shlibs        |  2 +-
 srcpkgs/mpv/template | 57 ++++++++++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 481250d5c924..aa1bbafb1bba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2214,7 +2214,7 @@ librrd.so.8 rrdtool-1.6.0_1
 librrd_th.so.4 rrdtool-1.4.9_1
 libmosquitto.so.1 libmosquitto-1.6.3_5
 libmosquittopp.so.1 libmosquittopp-1.6.3_5
-libmpv.so.1 mpv-0.8.0_2
+libmpv.so.2 mpv-0.35.0_1
 libmbedtls.so.12 mbedtls-2.13.1_1
 libmbedcrypto.so.3 mbedtls-2.9.0_1
 libmbedx509.so.0 mbedtls-2.9.0_1
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index ded8c1bbe98f..0e3c3ed8f81c 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,15 +1,26 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.34.1
-revision=2
-build_style=waf3
-configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
- --enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive
- --enable-libmpv-shared --enable-cplugins $(vopt_enable alsa) $(vopt_enable caca)
- $(vopt_enable jack) $(vopt_enable lcms lcms2) $(vopt_enable lua)
- $(vopt_enable openal) $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2)
- $(vopt_enable vapoursynth) $(vopt_enable vdpau) $(vopt_enable vulkan)
- $(vopt_enable vulkan shaderc) $(vopt_enable wayland) $(vopt_enable x11)"
+version=0.35.0
+revision=1
+build_style=meson
+configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled
+ -Dlibmpv=true -Dcplugins=enabled
+ -Dalsa=$(vopt_if alsa enabled disabled)
+ -Dcaca=$(vopt_if caca enabled disabled)
+ -Djack=$(vopt_if jack enabled disabled)
+ -Dlcms2=$(vopt_if lcms enabled disabled)
+ -Dlua=$(vopt_if lua enabled disabled)
+ -Dopenal=$(vopt_if openal enabled disabled)
+ -Dpulse=$(vopt_if pulseaudio enabled disabled)
+ -Dsdl2=$(vopt_if sdl2 enabled disabled)
+ -Dvapoursynth=$(vopt_if vapoursynth enabled disabled)
+ -Dvdpau=$(vopt_if vdpau enabled disabled)
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dshaderc=$(vopt_if vulkan enabled disabled)
+ -Dwayland=$(vopt_if wayland enabled disabled)
+ -Dx11=$(vopt_if x11 enabled disabled)
+ -Dpipewire=$(vopt_if pipewire enabled disabled)
+ -Dsndio=$(vopt_if sndio enabled disabled)"
 hostmakedepends="pkg-config python3-docutils $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel libXv-devel
  libass-devel libbluray-devel libcdio-paranoia-devel libdvdnav-devel
@@ -17,11 +28,12 @@ makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel libXv-devel
  libarchive-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if caca libcaca-devel)
  $(vopt_if jack jack-devel) $(vopt_if lcms lcms2-devel)
  $(vopt_if lua lua52-devel) $(vopt_if openal libopenal-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if vapoursynth vapoursynth-devel) $(vopt_if vdpau libvdpau-devel)
+ $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if pipewire pipewire-devel)
+ $(vopt_if sdl2 SDL2-devel) $(vopt_if vapoursynth vapoursynth-devel)
+ $(vopt_if vdpau libvdpau-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if vulkan "Vulkan-Headers vulkan-loader shaderc libplacebo-devel")
  $(vopt_if wayland "wayland-devel wayland-protocols libxkbcommon-devel")
- $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel")"
+ $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel libXpresent-devel")"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Video player based on MPlayer/mplayer2"
 maintainer="travankor <travankor@tuta.io>"
@@ -29,30 +41,23 @@ license="GPL-2.0-or-later"
 homepage="https://mpv.io"
 changelog="https://github.com/mpv-player/mpv/releases"
 distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=32ded8c13b6398310fa27767378193dc1db6d78b006b70dbcbd3123a1445e746
+checksum=dc411c899a64548250c142bf1fa1aa7528f1b4398a24c86b816093999049ec00
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-build_options="alsa caca jack lcms lua openal pulseaudio sdl2 vapoursynth vdpau
- vulkan wayland x11"
-build_options_default="alsa jack lcms lua pulseaudio vdpau vulkan wayland x11"
+build_options="alsa caca jack lcms lua openal pulseaudio pipewire sdl2
+ sndio vapoursynth vdpau vulkan wayland x11"
+build_options_default="alsa jack lcms lua pulseaudio pipewire vdpau vulkan
+ sndio wayland x11"
 desc_option_caca="Enable support for libcaca video output"
 desc_option_lcms="Enable support for LittleCMS 2 engine"
 desc_option_openal="Enable support for OpenAL audio output"
 vopt_conflict sdl2 wayland
 
-if [ -z "$CROSS_BUILD" ]; then
-	configure_args+=" --zshdir=/usr/share/zsh/site-functions"
-fi
-
-pre_configure() {
-	python3 bootstrap.py
-}
-
 mpv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 204fe84127ae3f05fc4d8b14a1521f41d5207153 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 12 Nov 2022 16:04:14 -0600
Subject: [PATCH 2/8] celluloid: rebuild for mpv-0.35.0

---
 srcpkgs/celluloid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template
index 739911562045..904fe4f631c0 100644
--- a/srcpkgs/celluloid/template
+++ b/srcpkgs/celluloid/template
@@ -1,7 +1,7 @@
 # Template file for 'celluloid'
 pkgname=celluloid
 version=0.23
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="gtk4-devel libepoxy-devel libglib-devel mpv-devel"

From ef732e6b0565624422c33aef59547fb743d41b35 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 12 Nov 2022 16:04:14 -0600
Subject: [PATCH 3/8] minitube: rebuild for mpv-0.35.0

---
 srcpkgs/minitube/patches/mpv-0.35.patch | 14 ++++++++++++++
 srcpkgs/minitube/template               |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/minitube/patches/mpv-0.35.patch

diff --git a/srcpkgs/minitube/patches/mpv-0.35.patch b/srcpkgs/minitube/patches/mpv-0.35.patch
new file mode 100644
index 000000000000..db13f9058f7f
--- /dev/null
+++ b/srcpkgs/minitube/patches/mpv-0.35.patch
@@ -0,0 +1,14 @@
+https://github.com/mpv-player/mpv/commit/632059816adde518c67f6606e3cfdef5bec18b52
+Index: minitube-3.9.3/lib/media/src/mpv/mpvwidget.cpp
+===================================================================
+--- minitube-3.9.3.orig/lib/media/src/mpv/mpvwidget.cpp
++++ minitube-3.9.3/lib/media/src/mpv/mpvwidget.cpp
+@@ -30,7 +30,7 @@ void MpvWidget::initializeGL() {
+     qDebug() << "initializeGL" << nativeParent;
+     if (nativeParent == nullptr) qFatal("No native parent");
+ 
+-    mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr};
++    mpv_opengl_init_params gl_init_params{get_proc_address, this};
+     mpv_render_param params[]{{MPV_RENDER_PARAM_API_TYPE, (void *)MPV_RENDER_API_TYPE_OPENGL},
+                               {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
+                               {MPV_RENDER_PARAM_INVALID, nullptr},
diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template
index 915458a43a6a..b4b50c0f9694 100644
--- a/srcpkgs/minitube/template
+++ b/srcpkgs/minitube/template
@@ -1,7 +1,7 @@
 # Template file for 'minitube'
 pkgname=minitube
 version=3.9.3
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="qt5-tools qt5-host-tools qt5-qmake git"
 makedepends="qt5-devel phonon-qt5-devel qt5-script-devel qt5-declarative-devel

From 951818f3887589475241f394cef99a82a16ddeeb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 12 Nov 2022 16:04:14 -0600
Subject: [PATCH 4/8] mpc-qt: update to 22.02.

---
 srcpkgs/mpc-qt/template | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/mpc-qt/template b/srcpkgs/mpc-qt/template
index 3e60cb06c896..7a7ae6f6cf96 100644
--- a/srcpkgs/mpc-qt/template
+++ b/srcpkgs/mpc-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'mpc-qt'
 pkgname=mpc-qt
-version=18.08
+version=22.02
 revision=1
 build_style=qmake
 configure_args="MPCQT_VERSION=${version}"
@@ -9,16 +9,6 @@ makedepends="qt5-devel qt5-x11extras-devel mpv-devel"
 short_desc="Clone of Media Player Classic reimplemented in Qt"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/cmdrkotori/mpc-qt"
-#distfiles="${homepage}/archive/v${version}.tar.gz"
-# https://github.com/mpv-player/mpv/commit/575197ff8b0a0d8cd14f7ee78461c1d61d045d72
-distfiles="https://sources.voidlinux.org/mpc-qt-18.08/v18.08.tar.gz
- https://raw.githubusercontent.com/mpv-player/mpv/2337fa4e0213993398d36cb3222633766d677dfd/libmpv/qthelper.hpp"
-checksum="c58fd90926773c9da8bdfc1a8e4dba0b95cbc58cee6db9981e8de94fd9534406
- 86e1fcba6001829b7e23a856db84d01ebc76e63528f74064d7bc5705015a2684"
-skip_extraction="qthelper.hpp"
-
-post_extract() {
-	mkdir -p mpv
-	cp $XBPS_SRCDISTDIR/mpc-qt-$version/qthelper.hpp mpv/
-}
+homepage="https://mpc-qt.github.io/"
+distfiles="https://github.com/mpc-qt/mpc-qt/archive/refs/tags/v${version}.tar.gz"
+checksum=fa6cffd6bde1304b6c0ec3aba8e98d03f4d73999fee4e4546026ec159530350d

From 6f9085568c75b003f86e164fee0129ac8cb54931 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 12 Nov 2022 16:04:15 -0600
Subject: [PATCH 5/8] [TODO] orion: rebuild for mpv-0.35.0

---
 srcpkgs/orion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/orion/template b/srcpkgs/orion/template
index d69f2ff04dd4..b1f2215b1d43 100644
--- a/srcpkgs/orion/template
+++ b/srcpkgs/orion/template
@@ -1,7 +1,7 @@
 # Template file for 'orion'
 pkgname=orion
 version=1.6.7
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols2-devel mpv-devel"

From 946ac44c785ce0a7796bd802ebc76d991282c30c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 12 Nov 2022 16:04:15 -0600
Subject: [PATCH 6/8] qimgv: rebuild for mpv-0.35.0

---
 srcpkgs/qimgv/patches/fix-mpv-opengl.patch | 11 +++++++++++
 srcpkgs/qimgv/template                     |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qimgv/patches/fix-mpv-opengl.patch

diff --git a/srcpkgs/qimgv/patches/fix-mpv-opengl.patch b/srcpkgs/qimgv/patches/fix-mpv-opengl.patch
new file mode 100644
index 000000000000..9fd3dffe9f96
--- /dev/null
+++ b/srcpkgs/qimgv/patches/fix-mpv-opengl.patch
@@ -0,0 +1,11 @@
+--- a/plugins/player_mpv/src/mpvwidget.cpp
++++ b/plugins/player_mpv/src/mpvwidget.cpp
+@@ -69,7 +69,7 @@
+ }
+ 
+ void MpvWidget::initializeGL() {
+-    mpv_opengl_init_params gl_init_params{get_proc_address, nullptr, nullptr};
++    mpv_opengl_init_params gl_init_params{get_proc_address, nullptr};
+     mpv_render_param params[]{
+         {MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)},
+         {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
diff --git a/srcpkgs/qimgv/template b/srcpkgs/qimgv/template
index bb91ee98eab7..7eb30db33992 100644
--- a/srcpkgs/qimgv/template
+++ b/srcpkgs/qimgv/template
@@ -1,7 +1,7 @@
 # Template file for 'qimgv'
 pkgname=qimgv
 version=1.0.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="$(vopt_if video -DVIDEO_SUPPORT=ON -DVIDEO_SUPPORT=OFF)
  $(vopt_if scale -DOPENCV_SUPPORT=ON -DOPENCV_SUPPORT=OFF)

From 2821ce720df01e44dde1922b74a840a2bf8d21a5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 12 Nov 2022 16:04:15 -0600
Subject: [PATCH 7/8] vidcutter: update to 6.0.5.1.

---
 srcpkgs/vidcutter/patches/mpv-0.35-1.patch | 387 +++++++++++++++++++++
 srcpkgs/vidcutter/patches/mpv-0.35-2.patch |  24 ++
 srcpkgs/vidcutter/patches/mpv-0.35-3.patch |  29 ++
 srcpkgs/vidcutter/template                 |  18 +-
 4 files changed, 452 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/vidcutter/patches/mpv-0.35-1.patch
 create mode 100644 srcpkgs/vidcutter/patches/mpv-0.35-2.patch
 create mode 100644 srcpkgs/vidcutter/patches/mpv-0.35-3.patch

diff --git a/srcpkgs/vidcutter/patches/mpv-0.35-1.patch b/srcpkgs/vidcutter/patches/mpv-0.35-1.patch
new file mode 100644
index 000000000000..759b787f7a69
--- /dev/null
+++ b/srcpkgs/vidcutter/patches/mpv-0.35-1.patch
@@ -0,0 +1,387 @@
+https://github.com/ozmartian/vidcutter/commit/1d88825feb5a73a50d019914ba9d0008562a58ce.patch
+
+From 1d88825feb5a73a50d019914ba9d0008562a58ce Mon Sep 17 00:00:00 2001
+From: Pete Alexandrou <pete@ozmartians.com>
+Date: Tue, 22 Feb 2022 11:29:00 +1100
+Subject: [PATCH] Patches to pympv to workaround opengl_cb deprecation from
+ libmpv
+
+---
+ vidcutter/libs/pympv/client.pxd |    54 +-
+ vidcutter/libs/pympv/mpv.pyx    |   192 +-
+ 3 files changed, 21832 insertions(+), 24808 deletions(-)
+
+diff --git a/vidcutter/libs/pympv/client.pxd b/vidcutter/libs/pympv/client.pxd
+index befe219e..d9a8816f 100644
+--- a/vidcutter/libs/pympv/client.pxd
++++ b/vidcutter/libs/pympv/client.pxd
+@@ -112,9 +112,9 @@ cdef extern from "mpv/client.h":
+ 
+     int mpv_load_config_file(mpv_handle *ctx, const char *filename) nogil
+ 
+-    void mpv_suspend(mpv_handle *ctx) nogil
++    # void mpv_suspend(mpv_handle *ctx) nogil
+ 
+-    void mpv_resume(mpv_handle *ctx) nogil
++    # void mpv_resume(mpv_handle *ctx) nogil
+ 
+     int64_t mpv_get_time_us(mpv_handle *ctx) nogil
+ 
+@@ -200,21 +200,21 @@ cdef extern from "mpv/client.h":
+         MPV_EVENT_START_FILE
+         MPV_EVENT_END_FILE
+         MPV_EVENT_FILE_LOADED
+-        MPV_EVENT_TRACKS_CHANGED
+-        MPV_EVENT_TRACK_SWITCHED
++        # MPV_EVENT_TRACKS_CHANGED
++        # MPV_EVENT_TRACK_SWITCHED
+         MPV_EVENT_IDLE
+-        MPV_EVENT_PAUSE
+-        MPV_EVENT_UNPAUSE
++        # MPV_EVENT_PAUSE
++        # MPV_EVENT_UNPAUSE
+         MPV_EVENT_TICK
+-        MPV_EVENT_SCRIPT_INPUT_DISPATCH
++        # MPV_EVENT_SCRIPT_INPUT_DISPATCH
+         MPV_EVENT_CLIENT_MESSAGE
+         MPV_EVENT_VIDEO_RECONFIG
+         MPV_EVENT_AUDIO_RECONFIG
+-        MPV_EVENT_METADATA_UPDATE
++        # MPV_EVENT_METADATA_UPDATE
+         MPV_EVENT_SEEK
+         MPV_EVENT_PLAYBACK_RESTART
+         MPV_EVENT_PROPERTY_CHANGE
+-        MPV_EVENT_CHAPTER_CHANGE
++        # MPV_EVENT_CHAPTER_CHANGE
+ 
+     const char *mpv_event_name(mpv_event_id event) nogil
+ 
+@@ -249,9 +249,9 @@ cdef extern from "mpv/client.h":
+         int reason
+         int error
+ 
+-    cdef struct mpv_event_script_input_dispatch:
+-        int arg0
+-        const char *type
++    # cdef struct mpv_event_script_input_dispatch:
++    #     int arg0
++    #     const char *type
+ 
+     cdef struct mpv_event_client_message:
+         int num_args
+@@ -282,27 +282,27 @@ cdef extern from "mpv/client.h":
+ 
+     void *mpv_get_sub_api(mpv_handle *ctx, mpv_sub_api sub_api) nogil
+ 
+-cdef extern from "mpv/opengl_cb.h":
+-    struct mpv_opengl_cb_context:
+-        pass
++# cdef extern from "mpv/opengl_cb.h":
++#     struct mpv_opengl_cb_context:
++#         pass
+ 
+-    ctypedef void (*mpv_opengl_cb_update_fn)(void *cb_ctx) nogil
+-    ctypedef void *(*mpv_opengl_cb_get_proc_address_fn)(void *fn_ctx,
+-                                                        const char *name) nogil
++#     ctypedef void (*mpv_opengl_cb_update_fn)(void *cb_ctx) nogil
++#     ctypedef void *(*mpv_opengl_cb_get_proc_address_fn)(void *fn_ctx,
++#                                                         const char *name) nogil
+ 
+-    void mpv_opengl_cb_set_update_callback(mpv_opengl_cb_context *ctx,
+-                                           mpv_opengl_cb_update_fn callback,
+-                                           void *callback_ctx) nogil
++#     void mpv_opengl_cb_set_update_callback(mpv_opengl_cb_context *ctx,
++#                                            mpv_opengl_cb_update_fn callback,
++#                                            void *callback_ctx) nogil
+ 
+-    int mpv_opengl_cb_init_gl(mpv_opengl_cb_context *ctx, const char *exts,
+-                              mpv_opengl_cb_get_proc_address_fn get_proc_address,
+-                              void *get_proc_address_ctx) nogil
++#     int mpv_opengl_cb_init_gl(mpv_opengl_cb_context *ctx, const char *exts,
++#                               mpv_opengl_cb_get_proc_address_fn get_proc_address,
++#                               void *get_proc_address_ctx) nogil
+ 
+-    int mpv_opengl_cb_draw(mpv_opengl_cb_context *ctx, int fbo, int w, int h) nogil
++#     int mpv_opengl_cb_draw(mpv_opengl_cb_context *ctx, int fbo, int w, int h) nogil
+ 
+-    int mpv_opengl_cb_report_flip(mpv_opengl_cb_context *ctx, int64_t time) nogil
++#     int mpv_opengl_cb_report_flip(mpv_opengl_cb_context *ctx, int64_t time) nogil
+ 
+-    int mpv_opengl_cb_uninit_gl(mpv_opengl_cb_context *ctx) nogil
++#     int mpv_opengl_cb_uninit_gl(mpv_opengl_cb_context *ctx) nogil
+ 
+ 
+ cdef extern from "mpv/render.h":
+diff --git a/vidcutter/libs/pympv/mpv.pyx b/vidcutter/libs/pympv/mpv.pyx
+index 540ea649..8af2dcc7 100644
+--- a/vidcutter/libs/pympv/mpv.pyx
++++ b/vidcutter/libs/pympv/mpv.pyx
+@@ -30,8 +30,8 @@ from client cimport *
+ __version__ = "0.3.0"
+ __author__ = "Andre D"
+ 
+-_REQUIRED_CAPI_MAJOR = 1
+-_MIN_CAPI_MINOR = 9
++_REQUIRED_CAPI_MAJOR = 2
++_MIN_CAPI_MINOR = 0
+ 
+ cdef unsigned long _CAPI_VERSION
+ with nogil:
+@@ -47,7 +47,7 @@ if _CAPI_MAJOR != _REQUIRED_CAPI_MAJOR or _CAPI_MINOR < _MIN_CAPI_MINOR:
+     )
+ 
+ cdef extern from "Python.h":
+-    void PyEval_InitThreads()
++    void Py_Initialize()
+ 
+ _is_py3 = sys.version_info >= (3,)
+ _strdec_err = "surrogateescape" if _is_py3 else "strict"
+@@ -67,7 +67,7 @@ def _strenc(s):
+         # In python2, assume bytes and walk right through
+         return s
+ 
+-PyEval_InitThreads()
++Py_Initialize()
+ 
+ class Errors:
+     """Set of known error codes from MpvError and Event responses.
+@@ -114,21 +114,21 @@ class Events:
+     start_file = MPV_EVENT_START_FILE
+     end_file = MPV_EVENT_END_FILE
+     file_loaded = MPV_EVENT_FILE_LOADED
+-    tracks_changed = MPV_EVENT_TRACKS_CHANGED
+-    tracks_switched = MPV_EVENT_TRACK_SWITCHED
++    # tracks_changed = MPV_EVENT_TRACKS_CHANGED
++    # tracks_switched = MPV_EVENT_TRACK_SWITCHED
+     idle = MPV_EVENT_IDLE
+-    pause = MPV_EVENT_PAUSE
+-    unpause = MPV_EVENT_UNPAUSE
++    # pause = MPV_EVENT_PAUSE
++    # unpause = MPV_EVENT_UNPAUSE
+     tick = MPV_EVENT_TICK
+-    script_input_dispatch = MPV_EVENT_SCRIPT_INPUT_DISPATCH
++    # script_input_dispatch = MPV_EVENT_SCRIPT_INPUT_DISPATCH
+     client_message = MPV_EVENT_CLIENT_MESSAGE
+     video_reconfig = MPV_EVENT_VIDEO_RECONFIG
+     audio_reconfig = MPV_EVENT_AUDIO_RECONFIG
+-    metadata_update = MPV_EVENT_METADATA_UPDATE
++    # metadata_update = MPV_EVENT_METADATA_UPDATE
+     seek = MPV_EVENT_SEEK
+     playback_restart = MPV_EVENT_PLAYBACK_RESTART
+     property_change = MPV_EVENT_PROPERTY_CHANGE
+-    chapter_change = MPV_EVENT_CHAPTER_CHANGE
++    # chapter_change = MPV_EVENT_CHAPTER_CHANGE
+ 
+ 
+ class LogLevels:
+@@ -166,17 +166,17 @@ cdef class EndOfFileReached(object):
+         return self
+ 
+ 
+-cdef class InputDispatch(object):
+-    """Data field for MPV_EVENT_SCRIPT_INPUT_DISPATCH events.
++# cdef class InputDispatch(object):
++#     """Data field for MPV_EVENT_SCRIPT_INPUT_DISPATCH events.
+ 
+-    Wraps: mpv_event_script_input_dispatch
+-    """
+-    cdef public object arg0, type
++#     Wraps: mpv_event_script_input_dispatch
++#     """
++#     cdef public object arg0, type
+ 
+-    cdef _init(self, mpv_event_script_input_dispatch* input):
+-        self.arg0 = input.arg0
+-        self.type = _strdec(input.type)
+-        return self
++#     cdef _init(self, mpv_event_script_input_dispatch* input):
++#         self.arg0 = input.arg0
++#         self.type = _strdec(input.type)
++#         return self
+ 
+ 
+ cdef class LogMessage(object):
+@@ -276,8 +276,8 @@ cdef class Event(object):
+             return Property()._init(<mpv_event_property*>data)
+         elif self.id == MPV_EVENT_LOG_MESSAGE:
+             return LogMessage()._init(<mpv_event_log_message*>data)
+-        elif self.id == MPV_EVENT_SCRIPT_INPUT_DISPATCH:
+-            return InputDispatch()._init(<mpv_event_script_input_dispatch*>data)
++        # elif self.id == MPV_EVENT_SCRIPT_INPUT_DISPATCH:
++        #     return InputDispatch()._init(<mpv_event_script_input_dispatch*>data)
+         elif self.id == MPV_EVENT_CLIENT_MESSAGE:
+             climsg = <mpv_event_client_message*>data
+             args = []
+@@ -396,17 +396,17 @@ cdef class Context(object):
+             time = mpv_get_time_us(self._ctx)
+         return time
+ 
+-    def suspend(self):
+-        """Wraps: mpv_suspend"""
+-        assert self._ctx
+-        with nogil:
+-            mpv_suspend(self._ctx)
++    # def suspend(self):
++    #     """Wraps: mpv_suspend"""
++    #     assert self._ctx
++    #     with nogil:
++    #         mpv_suspend(self._ctx)
+ 
+-    def resume(self):
+-        """Wraps: mpv_resume"""
+-        assert self._ctx
+-        with nogil:
+-            mpv_resume(self._ctx)
++    # def resume(self):
++    #     """Wraps: mpv_resume"""
++    #     assert self._ctx
++    #     with nogil:
++    #         mpv_resume(self._ctx)
+ 
+     @_errors
+     def request_event(self, event, enable):
+@@ -798,17 +798,17 @@ cdef class Context(object):
+         self.reply_userdata = None
+         self._ctx = NULL
+ 
+-    def opengl_cb_api(self):
+-        cdef void *cb
++    # def opengl_cb_api(self):
++    #     cdef void *cb
+ 
+-        _ctx = mpv_get_sub_api(self._ctx, MPV_SUB_API_OPENGL_CB)
+-        if not _ctx:
+-            raise MPVError("OpenGL API not available")
++    #     _ctx = mpv_get_sub_api(self._ctx, MPV_SUB_API_OPENGL_CB)
++    #     if not _ctx:
++    #         raise MPVError("OpenGL API not available")
+ 
+-        ctx = OpenGLContext()
+-        ctx._ctx = <mpv_opengl_cb_context*>_ctx
++    #     ctx = OpenGLContext()
++    #     ctx._ctx = <mpv_opengl_cb_context*>_ctx
+ 
+-        return ctx
++    #     return ctx
+ 
+     def __dealloc__(self):
+         self.shutdown()
+@@ -819,62 +819,62 @@ cdef void *_c_getprocaddress(void *ctx, const char *name) with gil:
+ cdef void _c_updatecb(void *ctx) with gil:
+     (<object>ctx)()
+ 
+-cdef class OpenGLContext(object):
+-    cdef:
+-        mpv_opengl_cb_context *_ctx
+-        bint inited
+-        object update_cb
+-
+-    def __init__(self):
+-        self.inited = False
+-        warnings.warn("OpenGLContext is deprecated, please switch to RenderContext", DeprecationWarning)
+-
+-    def init_gl(self, exts, get_proc_address):
+-        exts = _strenc(exts) if exts is not None else None
+-        cdef char* extsc = NULL
+-        if exts is not None:
+-            extsc = exts
+-        with nogil:
+-            err = mpv_opengl_cb_init_gl(self._ctx, extsc, &_c_getprocaddress,
+-                                        <void *>get_proc_address)
+-        if err < 0:
+-            raise MPVError(err)
+-
+-        self.inited = True
+-
+-    def set_update_callback(self, cb):
+-        self.update_cb = cb
+-        with nogil:
+-            mpv_opengl_cb_set_update_callback(self._ctx, &_c_updatecb, <void *>cb)
+-
+-    def draw(self, fbo, w, h):
+-        cdef:
+-            int fboc = fbo
+-            int wc = w
+-            int hc = h
+-        with nogil:
+-            err = mpv_opengl_cb_draw(self._ctx, fboc, wc, hc)
+-        if err < 0:
+-            raise MPVError(err)
+-
+-    def report_flip(self, time):
+-        cdef int64_t ctime = time
+-        with nogil:
+-            err = mpv_opengl_cb_report_flip(self._ctx, ctime)
+-        if err < 0:
+-            raise MPVError(err)
+-
+-    def uninit_gl(self):
+-        if not self.inited:
+-            return
+-        with nogil:
+-            err = mpv_opengl_cb_uninit_gl(self._ctx)
+-        if err < 0:
+-            raise MPVError(err)
+-        self.inited = False
+-
+-    def __dealloc__(self):
+-        self.uninit_gl()
++# cdef class OpenGLContext(object):
++#     cdef:
++#         mpv_opengl_cb_context *_ctx
++#         bint inited
++#         object update_cb
++
++#     def __init__(self):
++#         self.inited = False
++#         warnings.warn("OpenGLContext is deprecated, please switch to RenderContext", DeprecationWarning)
++
++#     def init_gl(self, exts, get_proc_address):
++#         exts = _strenc(exts) if exts is not None else None
++#         cdef char* extsc = NULL
++#         if exts is not None:
++#             extsc = exts
++#         with nogil:
++#             err = mpv_opengl_cb_init_gl(self._ctx, extsc, &_c_getprocaddress,
++#                                         <void *>get_proc_address)
++#         if err < 0:
++#             raise MPVError(err)
++
++#         self.inited = True
++
++#     def set_update_callback(self, cb):
++#         self.update_cb = cb
++#         with nogil:
++#             mpv_opengl_cb_set_update_callback(self._ctx, &_c_updatecb, <void *>cb)
++
++#     def draw(self, fbo, w, h):
++#         cdef:
++#             int fboc = fbo
++#             int wc = w
++#             int hc = h
++#         with nogil:
++#             err = mpv_opengl_cb_draw(self._ctx, fboc, wc, hc)
++#         if err < 0:
++#             raise MPVError(err)
++
++#     def report_flip(self, time):
++#         cdef int64_t ctime = time
++#         with nogil:
++#             err = mpv_opengl_cb_report_flip(self._ctx, ctime)
++#         if err < 0:
++#             raise MPVError(err)
++
++#     def uninit_gl(self):
++#         if not self.inited:
++#             return
++#         with nogil:
++#             err = mpv_opengl_cb_uninit_gl(self._ctx)
++#         if err < 0:
++#             raise MPVError(err)
++#         self.inited = False
++
++#     def __dealloc__(self):
++#         self.uninit_gl()
+ 
+ DEF MAX_RENDER_PARAMS = 32
+ 
diff --git a/srcpkgs/vidcutter/patches/mpv-0.35-2.patch b/srcpkgs/vidcutter/patches/mpv-0.35-2.patch
new file mode 100644
index 000000000000..c982ded8475a
--- /dev/null
+++ b/srcpkgs/vidcutter/patches/mpv-0.35-2.patch
@@ -0,0 +1,24 @@
+https://github.com/ozmartian/vidcutter/commit/8010f5c64efe68d8130a036f976d2d2ff1c868ad.patch
+
+From 8010f5c64efe68d8130a036f976d2d2ff1c868ad Mon Sep 17 00:00:00 2001
+From: Pete Alexandrou <pete@ozmartians.com>
+Date: Tue, 22 Feb 2022 16:08:24 +1100
+Subject: [PATCH] fix libmpv version number format
+
+---
+ vidcutter/libs/mpvwidget.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vidcutter/libs/mpvwidget.py b/vidcutter/libs/mpvwidget.py
+index 239b6c9c..6661ad85 100644
+--- a/vidcutter/libs/mpvwidget.py
++++ b/vidcutter/libs/mpvwidget.py
+@@ -247,7 +247,7 @@ def format(self, stream: str='video') -> str:
+ 
+     def version(self) -> str:
+         ver = self.mpv.api_version
+-        return '{0}.{1}'.format(ver[0], ver[1])
++        return '{0}.{1}'.format(ver[1], ver[0])
+ 
+     def option(self, option: str, val):
+         if isinstance(val, bool):
diff --git a/srcpkgs/vidcutter/patches/mpv-0.35-3.patch b/srcpkgs/vidcutter/patches/mpv-0.35-3.patch
new file mode 100644
index 000000000000..d1f5f1364c62
--- /dev/null
+++ b/srcpkgs/vidcutter/patches/mpv-0.35-3.patch
@@ -0,0 +1,29 @@
+https://github.com/ozmartian/vidcutter/commit/4cf1458d832e6ac7a824d7963c6dc3a0e5c17574.patch
+
+From 4cf1458d832e6ac7a824d7963c6dc3a0e5c17574 Mon Sep 17 00:00:00 2001
+From: Pete Alexandrou <pete@ozmartians.com>
+Date: Sat, 30 Apr 2022 15:49:17 +1000
+Subject: [PATCH] pympv updates
+
+---
+ vidcutter/libs/pympv/mpv.c   | 3792 +++++++++++++++++-----------------
+ vidcutter/libs/pympv/mpv.pyx |    6 +-
+ 2 files changed, 1900 insertions(+), 1898 deletions(-)
+
+diff --git a/vidcutter/libs/pympv/mpv.pyx b/vidcutter/libs/pympv/mpv.pyx
+index 8af2dcc7..1decdda8 100644
+--- a/vidcutter/libs/pympv/mpv.pyx
++++ b/vidcutter/libs/pympv/mpv.pyx
+@@ -30,8 +30,10 @@ from client cimport *
+ __version__ = "0.3.0"
+ __author__ = "Andre D"
+ 
+-_REQUIRED_CAPI_MAJOR = 2
+-_MIN_CAPI_MINOR = 0
++#_REQUIRED_CAPI_MAJOR = 2
++#_MIN_CAPI_MINOR = 0
++_REQUIRED_CAPI_MAJOR = 1
++_MIN_CAPI_MINOR = 109
+ 
+ cdef unsigned long _CAPI_VERSION
+ with nogil:
diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template
index 07bda50c917c..6eddc1345ec1 100644
--- a/srcpkgs/vidcutter/template
+++ b/srcpkgs/vidcutter/template
@@ -1,7 +1,7 @@
 # Template file for 'vidcutter'
 pkgname=vidcutter
-version=6.0.0
-revision=6
+version=6.0.5.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"
 makedepends="mpv-devel python3-devel"
@@ -11,9 +11,15 @@ short_desc="Video cutter and joiner based on FFmpeg"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ozmartian/vidcutter"
-distfiles="https://github.com/ozmartian/vidcutter/archive/refs/tags/${version}.tar.gz"
-checksum=c09be7eceaf42ff7211fe3b8125279c4fec7f7d251d272b61d579e426bd4e2c2
+# pympv isn't packaged because it will create a package conflicts with
+# python3-mpv
+distfiles="https://github.com/ozmartian/vidcutter/archive/refs/tags/${version}.tar.gz
+ https://github.com/marcan/pympv/archive/refs/tags/v0.7.1.tar.gz"
+checksum="c6374eaedb845f9e580e555dd12c1db1cf2ffa28d3756b08e2ae28c1a4cd4a96
+ 1d262e7fb2531d27633bdc2334fbc1c3ce094457a6a8f3cfc1c6c9799c1ef202"
 
-pre_build() {
-	rm -f vidcutter/libs/pympv/mpv.c
+post_extract() {
+	mv vidcutter-*/* .
+	rm -rf vidcutter/libs/pympv
+	mv pympv-* vidcutter/libs/pympv
 }

From a4a7c91349e24d5149813e305e225aee4a2d5243 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 14 Nov 2022 08:08:31 -0600
Subject: [PATCH 8/8] stremio-shell: rebuild for mpv-0.35.0

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 641000d6fe64..2b0c0b23af69 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.159
-revision=2
+revision=3
 _singleapplication_hash=f1e15081dc57a9c03f7f4f165677f18802e1437a
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
 create_wrksrc=yes