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: 23754 bytes --]

From 26ad6f89c8faaba2e24348cdb7fd4280a71f4e2e 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/9] 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 76512744735e..862bba59babc 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 c7dfabea6ba5f5e4e59c3a2077e04d25f16462f5 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/9] 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 7770c30180af7c8942e92235ddf06f5a421b350a 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/9] [TODO] minitube: rebuild for mpv-0.35.0

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

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 ebc04291a247dd1aa578f9f99ec502898443692f 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/9] 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 c5bb728fbcdbeba7677bc32038d69983e8999f03 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/9] [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 6e34dd69ac8bc4803fdc6db24f0a3b0e23249781 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/9] plex-media-player: remove package

https://github.com/plexinc/plex-media-player/commit/d9685b274934855a707a37613cae09108ee9db6c

No longer builds due to relying on deprecated features.
---
 .../patches/fix-opengl-cb-api-usage.patch     | 164 ------------------
 .../patches/qt5-append-header.patch           |  16 --
 srcpkgs/plex-media-player/template            |  52 ------
 srcpkgs/plex-media-player/update              |   1 -
 4 files changed, 233 deletions(-)
 delete mode 100644 srcpkgs/plex-media-player/patches/fix-opengl-cb-api-usage.patch
 delete mode 100644 srcpkgs/plex-media-player/patches/qt5-append-header.patch
 delete mode 100644 srcpkgs/plex-media-player/template
 delete mode 100644 srcpkgs/plex-media-player/update

diff --git a/srcpkgs/plex-media-player/patches/fix-opengl-cb-api-usage.patch b/srcpkgs/plex-media-player/patches/fix-opengl-cb-api-usage.patch
deleted file mode 100644
index fb22e7f9f518..000000000000
--- a/srcpkgs/plex-media-player/patches/fix-opengl-cb-api-usage.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-The opengl-cb interface has been retired; patch in libmpv usage. 
-https://github.com/plexinc/plex-media-player/issues/997
-https://github.com/plexinc/plex-media-player/pull/999
-
---- a/src/player/PlayerComponent.cpp
-+++ b/src/player/PlayerComponent.cpp
-@@ -259,7 +259,7 @@ void PlayerComponent::setQtQuickWindow(QQuickWindow* window)
- ///////////////////////////////////////////////////////////////////////////////////////////////////
- void PlayerComponent::setWindow(QQuickWindow* window)
- {
--  QString vo = "opengl-cb";
-+  QString vo = "libmpv";
- 
- #ifdef TARGET_RPI
-   window->setFlags(Qt::FramelessWindowHint);
-@@ -276,7 +276,7 @@ void PlayerComponent::setWindow(QQuickWindow* window)
- 
-   mpv::qt::set_property(m_mpv, "vo", vo);
- 
--  if (vo == "opengl-cb")
-+  if (vo == "libmpv")
-     setQtQuickWindow(window);
- }
- 
---- a/src/player/PlayerQuickItem.cpp
-+++ b/src/player/PlayerQuickItem.cpp
-@@ -11,6 +11,8 @@
- #include <QtQuick/QQuickWindow>
- #include <QOpenGLFunctions>
- 
-+#include <mpv/render_gl.h>
-+
- #include "QsLog.h"
- #include "utils/Utils.h"
- 
-@@ -93,7 +95,6 @@ class RequestRepaintJob : public QRunnable
- PlayerRenderer::PlayerRenderer(mpv::qt::Handle mpv, QQuickWindow* window)
- : m_mpv(mpv), m_mpvGL(nullptr), m_window(window), m_size(), m_hAvrtHandle(nullptr), m_videoRectangle(-1, -1, -1, -1), m_fbo(0)
- {
--  m_mpvGL = (mpv_opengl_cb_context *)mpv_get_sub_api(m_mpv, MPV_SUB_API_OPENGL_CB);
- }
- 
- ///////////////////////////////////////////////////////////////////////////////////////////////////
-@@ -104,11 +105,27 @@ bool PlayerRenderer::init()
-   DwmEnableMMCSS(TRUE);
- #endif
- 
--  mpv_opengl_cb_set_update_callback(m_mpvGL, on_update, (void *)this);
- 
-   // Signals presence of MPGetNativeDisplay().
-   const char *extensions = "GL_MP_MPGetNativeDisplay";
--  return mpv_opengl_cb_init_gl(m_mpvGL, extensions, get_proc_address, nullptr) >= 0;
-+
-+  mpv_opengl_init_params opengl_params = {
-+      .get_proc_address = get_proc_address,
-+      .get_proc_address_ctx = NULL,
-+      .extra_exts = extensions,
-+  }; 
-+  mpv_render_param params[] = {
-+    {MPV_RENDER_PARAM_API_TYPE, (void*)MPV_RENDER_API_TYPE_OPENGL},
-+    {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &opengl_params},
-+    {MPV_RENDER_PARAM_INVALID},
-+  };
-+  int err = mpv_render_context_create(&m_mpvGL, m_mpv, params);
-+
-+  if (err >= 0) {
-+    mpv_render_context_set_update_callback(m_mpvGL, on_update, (void *)this);
-+    return true;
-+  }
-+  return false;
- }
- 
- ///////////////////////////////////////////////////////////////////////////////////////////////////
-@@ -116,7 +133,8 @@ PlayerRenderer::~PlayerRenderer()
- {
-   // Keep in mind that the m_mpv handle must be held until this is done.
-   if (m_mpvGL)
--    mpv_opengl_cb_uninit_gl(m_mpvGL);
-+    mpv_render_context_free(m_mpvGL);
-+  m_mpvGL = nullptr;
-   delete m_fbo;
- }
- 
-@@ -158,9 +176,18 @@ void PlayerRenderer::render()
-     }
-   }
- 
--  // The negative height signals to mpv that the video should be flipped
--  // (according to the flipped OpenGL coordinate system).
--  mpv_opengl_cb_draw(m_mpvGL, fbo, fboSize.width(), (flip ? -1 : 1) * fboSize.height());
-+  mpv_opengl_fbo mpv_fbo = {
-+    .fbo = fbo,
-+    .w = fboSize.width(),
-+    .h = fboSize.height(),
-+  };
-+  int mpv_flip = flip ? -1 : 0;
-+  mpv_render_param params[] = {
-+    {MPV_RENDER_PARAM_OPENGL_FBO, &mpv_fbo},
-+    {MPV_RENDER_PARAM_FLIP_Y, &mpv_flip},
-+    {MPV_RENDER_PARAM_INVALID}
-+  };
-+  mpv_render_context_render(m_mpvGL, params);
- 
-   m_window->resetOpenGLState();
- 
-@@ -177,7 +204,8 @@ void PlayerRenderer::render()
- ///////////////////////////////////////////////////////////////////////////////////////////////////
- void PlayerRenderer::swap()
- {
--  mpv_opengl_cb_report_flip(m_mpvGL, 0);
-+  if (m_mpvGL)
-+    mpv_render_context_report_swap(m_mpvGL);
- }
- 
- ///////////////////////////////////////////////////////////////////////////////////////////////////
-@@ -224,7 +252,7 @@ PlayerQuickItem::PlayerQuickItem(QQuickItem* parent)
- PlayerQuickItem::~PlayerQuickItem()
- {
-   if (m_mpvGL)
--    mpv_opengl_cb_set_update_callback(m_mpvGL, nullptr, nullptr);
-+    mpv_render_context_set_update_callback(m_mpvGL, nullptr, nullptr);
- }
- 
- ///////////////////////////////////////////////////////////////////////////////////////////////////
-@@ -298,10 +326,6 @@ void PlayerQuickItem::initMpv(PlayerComponent* player)
- {
-   m_mpv = player->getMpvHandle();
- 
--  m_mpvGL = (mpv_opengl_cb_context *)mpv_get_sub_api(m_mpv, MPV_SUB_API_OPENGL_CB);
--  if (!m_mpvGL)
--    throw FatalException(tr("OpenGL not enabled in libmpv."));
--
-   connect(player, &PlayerComponent::windowVisible, this, &QQuickItem::setVisible);
-   window()->update();
- }
---- a/src/player/PlayerQuickItem.h
-+++ b/src/player/PlayerQuickItem.h
-@@ -6,7 +6,7 @@
- #include <QOpenGLFramebufferObject>
- 
- #include <mpv/client.h>
--#include <mpv/opengl_cb.h>
-+#include <mpv/render.h>
- 
- #ifdef Q_OS_WIN32
- #include <windows.h>
-@@ -34,7 +34,7 @@ public slots:
- private:
-   static void on_update(void *ctx);
-   mpv::qt::Handle m_mpv;
--  mpv_opengl_cb_context* m_mpvGL;
-+  mpv_render_context* m_mpvGL;
-   QQuickWindow* m_window;
-   QSize m_size;
-   HANDLE m_hAvrtHandle;
-@@ -64,7 +64,7 @@ private slots:
- 
- private:
-     mpv::qt::Handle m_mpv;
--    mpv_opengl_cb_context* m_mpvGL;
-+    mpv_render_context* m_mpvGL;
-     PlayerRenderer* m_renderer;
-     QString m_debugInfo;
- };
diff --git a/srcpkgs/plex-media-player/patches/qt5-append-header.patch b/srcpkgs/plex-media-player/patches/qt5-append-header.patch
deleted file mode 100644
index 898f7a321131..000000000000
--- a/srcpkgs/plex-media-player/patches/qt5-append-header.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/player/CodecsComponent.cpp	2020-05-19 19:32:23.000000000 +0200
-+++ b/src/player/CodecsComponent.cpp	2020-07-28 08:00:34.966060781 +0200
-@@ -684,9 +684,11 @@
- {
-   Downloader::HeaderList headers;
-   QString auth = SystemComponent::Get().authenticationToken();
-+  QString prod = WITH_CODECS ? "Plex Media Player" : "openpmp";
-+  QString plat = "Konvergo";
-   if (auth.size())
-     headers.append({"X-Plex-Token", auth});
--  headers.append({"X-Plex-Product", WITH_CODECS ? "Plex Media Player" : "openpmp"});
--  headers.append({"X-Plex-Platform", "Konvergo"});
-+  headers.append({"X-Plex-Product", prod});
-+  headers.append({"X-Plex-Platform", plat});
-   return headers;
- }
diff --git a/srcpkgs/plex-media-player/template b/srcpkgs/plex-media-player/template
deleted file mode 100644
index 8e96eaf89949..000000000000
--- a/srcpkgs/plex-media-player/template
+++ /dev/null
@@ -1,52 +0,0 @@
-# Template file for 'plex-media-player'
-pkgname=plex-media-player
-version=2.58.0
-revision=3
-_verbuild=1076
-_commit_rev=38e019da
-# See CMakeModules/WebClient.cmake
-_buildid_version=183-045db5be50e175
-# See https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/buildid.cmake
-_clientdesktop_version=4.29.2-e50e175
-_clienttv_version=4.29.6-045db5b
-build_style=cmake
-configure_args="-DQTROOT="${XBPS_CROSS_BASE}/usr" -DFULL_GIT_REVISION=${_commit_rev}"
-hostmakedepends="pkg-config python3"
-makedepends="libcec-devel libX11-devel libXext-devel libXrandr-devel
- MesaLib-devel mpv-devel qt5-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel qt5-webengine-devel qt5-x11extras-devel SDL2-devel zlib-devel"
-depends="qt5-quickcontrols"
-short_desc="Next generation Plex Desktop/Embedded Client"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/plexinc/plex-media-player"
-distfiles="https://github.com/plexinc/plex-media-player/archive/v${version}.${_verbuild}-${_commit_rev}.tar.gz
- https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/buildid.cmake>buildid-${_buildid_version}.cmake
- https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-desktop-${_clientdesktop_version}.tar.xz
- https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-desktop-${_clientdesktop_version}.tar.xz.sha1
- https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-tv-${_clienttv_version}.tar.xz
- https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-tv-${_clienttv_version}.tar.xz.sha1"
-checksum="f73ddae52d40eb5019283a16c83f4d5909dc1059ced85d6298e5525347705341
- 0331e53bb67c4b14284fafbe3a98700c3438ece99b9e969bcb49a1d583674af7
- c56c1784dd8de0fbda971b66e4fc19a6b91c154e9122213a7c0ef577613a94fe
- eef51c4ee379ca914522b072832bad119bb831897958f985bab79097a1ef571f
- e04b7d77804efb850f6abbec48982526f6fe727a74a143f73b83033672de3fb8
- 53cbb948ec4fa73f073892ab6179481f1d17d3c165b2997aee1973739ee0eeff"
-skip_extraction="buildid-${_buildid_version}.cmake
- web-client-desktop-${_clientdesktop_version}.tar.xz
- web-client-desktop-${_clientdesktop_version}.tar.xz.sha1
- web-client-tv-${_clienttv_version}.tar.xz
- web-client-tv-${_clienttv_version}.tar.xz.sha1"
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel qt5-host-tools"
-fi
-
-post_extract() {
-	mkdir -p "${wrksrc}/build/dependencies"
-	cp "${XBPS_SRCDISTDIR}/plex-media-player-${version}/buildid-${_buildid_version}.cmake" "${wrksrc}/build/dependencies"
-	cp "${XBPS_SRCDISTDIR}/plex-media-player-${version}/web-client-desktop-${_clientdesktop_version}.tar.xz" "${wrksrc}/build/dependencies"
-	cp "${XBPS_SRCDISTDIR}/plex-media-player-${version}/web-client-desktop-${_clientdesktop_version}.tar.xz.sha1" "${wrksrc}/build/dependencies"
-	cp "${XBPS_SRCDISTDIR}/plex-media-player-${version}/web-client-tv-${_clienttv_version}.tar.xz" "${wrksrc}/build/dependencies"
-	cp "${XBPS_SRCDISTDIR}/plex-media-player-${version}/web-client-tv-${_clienttv_version}.tar.xz.sha1" "${wrksrc}/build/dependencies"
-}
diff --git a/srcpkgs/plex-media-player/update b/srcpkgs/plex-media-player/update
deleted file mode 100644
index 5adfae106695..000000000000
--- a/srcpkgs/plex-media-player/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/v?\K[\d+\.]+'

From affa9d41b2583a06a2386813ddfa212f6561aef8 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/9] 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 7e1d23e16e66497fdc84a1f98ac3baa9eefaea81 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 8/9] [TODO] 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 ac133f6c3729..45687a9a4289 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=1
+revision=2
 _singleapplication_hash=f1e15081dc57a9c03f7f4f165677f18802e1437a
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
 create_wrksrc=yes

From abbc379eb39b9b1ad6c48787c23f1211e7e6ab14 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 9/9] [TODO] vidcutter: update to 6.0.5.1.

---
 srcpkgs/vidcutter/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template
index 07bda50c917c..93e6dbefaacc 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"
@@ -12,7 +12,7 @@ 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
+checksum=c6374eaedb845f9e580e555dd12c1db1cf2ffa28d3756b08e2ae28c1a4cd4a96
 
 pre_build() {
 	rm -f vidcutter/libs/pympv/mpv.c