Date: Sunday, November 13, 2022 @ 13:31:38 Author: dvzrv Revision: 1347251
upgpkg: minitube 3.9.3-2: Rebuild against mpv 0.35. Add upstreamed patch for compatibility with mpv 0.35: https://github.com/flaviotordini/minitube/issues/217 Remove unnecessary quotes and curly braces. Added: minitube/trunk/minitube-3.9.3-mpv_0.35.patch Modified: minitube/trunk/PKGBUILD -------------------------------+ PKGBUILD | 24 +++++++++++++++++------- minitube-3.9.3-mpv_0.35.patch | 16 ++++++++++++++++ 2 files changed, 33 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-13 13:25:46 UTC (rev 1347250) +++ PKGBUILD 2022-11-13 13:31:38 UTC (rev 1347251) @@ -4,7 +4,7 @@ pkgname=minitube pkgver=3.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="A YouTube desktop application" arch=(x86_64) url="https://flavio.tordini.org/minitube"; @@ -12,12 +12,22 @@ depends=(gcc-libs glibc qt5-base qt5-declarative qt5-x11extras) makedepends=(mpv qt5-tools) options=(debug) -source=("https://github.com/flaviotordini/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.bz2";) -sha512sums=('6cae7e5a3d03678ccf09d9c25e66f31d8e447defd956611cb0af1edeb953c283ccffbfae159db0fceafe16066fa02a07df66d966ee4172018b10c765034f3b81') -b2sums=('cfad747bdae5dbbdc89dfb5dba341f3c443e8c1da6030db9a08ed6dbfde163a3ff79f7a3ebb4ec1d2e0892d037d21b234a2e82676aac9c5a1562fd814cd9b22d') +source=( + https://github.com/flaviotordini/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2 + $pkgname-3.9.3-mpv_0.35.patch +) +sha512sums=('6cae7e5a3d03678ccf09d9c25e66f31d8e447defd956611cb0af1edeb953c283ccffbfae159db0fceafe16066fa02a07df66d966ee4172018b10c765034f3b81' + '5fba6410a317d23e00f8372c1823df28a329990328ff9aa5bbb802985e57c4b95f96d41bb949e32804b7053f38a3f14b1cb79f8b5a5a49ff3236a31d07c308b9') +b2sums=('cfad747bdae5dbbdc89dfb5dba341f3c443e8c1da6030db9a08ed6dbfde163a3ff79f7a3ebb4ec1d2e0892d037d21b234a2e82676aac9c5a1562fd814cd9b22d' + '610c3c455042ddf81fdafa2ce28e0d4e4049d7ce4e533490e77e12a1e2d15f6b305d51eec261e88986d39388fc278230c137a5b358a74448b586e2e5eef2c213') +prepare() { + # fix build against mpv >= 0.35: https://github.com/flaviotordini/minitube/issues/217 + patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-3.9.3-mpv_0.35.patch +} + build() { - cd "${pkgname}-${pkgver}" + cd $pkgname-$pkgver qmake } @@ -24,6 +34,6 @@ package() { depends+=(libmpv.so) - make install INSTALL_ROOT="${pkgdir}/" -C "${pkgname}-${pkgver}" - install -vDm 644 "${pkgname}-${pkgver}/"{AUTHORS,CHANGES,README.md,TODO} -t "${pkgdir}/usr/share/doc/${pkgname}" + make install INSTALL_ROOT="$pkgdir/" -C $pkgname-$pkgver + install -vDm 644 $pkgname-$pkgver/{AUTHORS,CHANGES,README.md,TODO} -t "$pkgdir/usr/share/doc/$pkgname/" } Added: minitube-3.9.3-mpv_0.35.patch =================================================================== --- minitube-3.9.3-mpv_0.35.patch (rev 0) +++ minitube-3.9.3-mpv_0.35.patch 2022-11-13 13:31:38 UTC (rev 1347251) @@ -0,0 +1,16 @@ +diff -Nur minitube-3.9.2/lib/media/src/mpv/mpvwidget.cpp new/lib/media/src/mpv/mpvwidget.cpp +--- minitube-3.9.2/lib/media/src/mpv/mpvwidget.cpp 2021-11-11 13:11:41.000000000 +0100 ++++ new/lib/media/src/mpv/mpvwidget.cpp 2022-01-21 18:07:34.170765429 +0100 +@@ -30,7 +30,11 @@ + qDebug() << "initializeGL" << nativeParent; + if (nativeParent == nullptr) qFatal("No native parent"); + +- mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0) ++ mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #else ++ mpv_opengl_init_params gl_init_params{get_proc_address, this}; ++ #endif + 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},
