diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2022-11-06 13:50:49 -0500 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2022-11-07 14:27:57 -0500 |
| commit | a1617dacbcaa34c7f89d56cd8a303ebefd6601c9 (patch) | |
| tree | 902a3374898da4b29200c4318c0b1b9fe968a776 /media-gfx/photoqt | |
| parent | media-gfx/hydrus: remove direct dependency on media-video/mpv (diff) | |
| download | gentoo-a1617dacbcaa34c7f89d56cd8a303ebefd6601c9.tar.gz gentoo-a1617dacbcaa34c7f89d56cd8a303ebefd6601c9.tar.bz2 gentoo-a1617dacbcaa34c7f89d56cd8a303ebefd6601c9.zip | |
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@gentoo.org>
Diffstat (limited to 'media-gfx/photoqt')
| -rw-r--r-- | media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch | 20 | ||||
| -rw-r--r-- | media-gfx/photoqt/photoqt-2.9.1-r1.ebuild (renamed from media-gfx/photoqt/photoqt-2.9.1.ebuild) | 6 |
2 files changed, 25 insertions, 1 deletions
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 <ionen@gentoo.org> +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 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 |