commit: a1617dacbcaa34c7f89d56cd8a303ebefd6601c9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 18:50:49 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 7 19:27:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1617dac
media-gfx/photoqt: use mpv slot, fix with api 2.0
Very trivial fix that's known to not break anything
with old api, so doing straight-to-strable.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../photoqt/files/photoqt-2.9.1-libmpv-api2.patch | 20 ++++++++++++++++++++
...{photoqt-2.9.1.ebuild => photoqt-2.9.1-r1.ebuild} | 6 +++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch
b/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch
new file mode 100644
index 000000000000..006b90a915b6
--- /dev/null
+++ b/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch
@@ -0,0 +1,20 @@
+https://gitlab.com/lspies/photoqt/-/merge_requests/10
+From: Ionen Wolkens <[email protected]>
+Date: Sun, 6 Nov 2022 13:22:36 -0500
+Subject: [PATCH] [libmpv] drop gl_init_params' deprecated parameter for api
+ 2.0
+
+Fixes build issue with upcoming mpv-0.35.0 (libmpv.so.2),
+and remains compatible with current.
+--- a/cplusplus/libmpv/mpvobject.cpp
++++ b/cplusplus/libmpv/mpvobject.cpp
+@@ -74,7 +74,7 @@ public:
+ QOpenGLFramebufferObject * createFramebufferObject(const QSize &size) {
+ // init mpv_gl:
+ if (!obj->mpv_gl) {
+- mpv_opengl_init_params gl_init_params{get_proc_address_mpv,
nullptr, nullptr};
++ mpv_opengl_init_params gl_init_params{get_proc_address_mpv,
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},
+GitLab
diff --git a/media-gfx/photoqt/photoqt-2.9.1.ebuild
b/media-gfx/photoqt/photoqt-2.9.1-r1.ebuild
similarity index 95%
rename from media-gfx/photoqt/photoqt-2.9.1.ebuild
rename to media-gfx/photoqt/photoqt-2.9.1-r1.ebuild
index f73af804f930..094f15dc4bbd 100644
--- a/media-gfx/photoqt/photoqt-2.9.1.ebuild
+++ b/media-gfx/photoqt/photoqt-2.9.1-r1.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="
!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
)
- mpv? ( media-video/mpv[libmpv] )
+ mpv? ( media-video/mpv:=[libmpv] )
pdf? ( app-text/poppler[qt5] )
raw? ( media-libs/libraw:= )
"
@@ -51,6 +51,10 @@ RDEPEND="${COMMON_DEPEND}
"
BDEPEND="dev-qt/linguist-tools:5"
+PATCHES=(
+ "${FILESDIR}"/${P}-libmpv-api2.patch
+)
+
src_configure() {
local mycmakeargs=(
-DCHROMECAST=OFF # TODO needs python
