| 1 |
commit: a1617dacbcaa34c7f89d56cd8a303ebefd6601c9 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 6 18:50:49 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 7 19:27:57 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1617dac |
| 7 |
|
| 8 |
media-gfx/photoqt: use mpv slot, fix with api 2.0 |
| 9 |
|
| 10 |
Very trivial fix that's known to not break anything |
| 11 |
with old api, so doing straight-to-strable. |
| 12 |
|
| 13 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 14 |
|
| 15 |
.../photoqt/files/photoqt-2.9.1-libmpv-api2.patch | 20 ++++++++++++++++++++ |
| 16 |
...{photoqt-2.9.1.ebuild => photoqt-2.9.1-r1.ebuild} | 6 +++++- |
| 17 |
2 files changed, 25 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 000000000000..006b90a915b6 |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch |
| 24 |
@@ -0,0 +1,20 @@ |
| 25 |
+https://gitlab.com/lspies/photoqt/-/merge_requests/10 |
| 26 |
+From: Ionen Wolkens <ionen@g.o> |
| 27 |
+Date: Sun, 6 Nov 2022 13:22:36 -0500 |
| 28 |
+Subject: [PATCH] [libmpv] drop gl_init_params' deprecated parameter for api |
| 29 |
+ 2.0 |
| 30 |
+ |
| 31 |
+Fixes build issue with upcoming mpv-0.35.0 (libmpv.so.2), |
| 32 |
+and remains compatible with current. |
| 33 |
+--- a/cplusplus/libmpv/mpvobject.cpp |
| 34 |
++++ b/cplusplus/libmpv/mpvobject.cpp |
| 35 |
+@@ -74,7 +74,7 @@ public: |
| 36 |
+ QOpenGLFramebufferObject * createFramebufferObject(const QSize &size) { |
| 37 |
+ // init mpv_gl: |
| 38 |
+ if (!obj->mpv_gl) { |
| 39 |
+- mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr, nullptr}; |
| 40 |
++ mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr}; |
| 41 |
+ mpv_render_param params[]{ |
| 42 |
+ {MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)}, |
| 43 |
+ {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params}, |
| 44 |
+GitLab |
| 45 |
|
| 46 |
diff --git a/media-gfx/photoqt/photoqt-2.9.1.ebuild b/media-gfx/photoqt/photoqt-2.9.1-r1.ebuild |
| 47 |
similarity index 95% |
| 48 |
rename from media-gfx/photoqt/photoqt-2.9.1.ebuild |
| 49 |
rename to media-gfx/photoqt/photoqt-2.9.1-r1.ebuild |
| 50 |
index f73af804f930..094f15dc4bbd 100644 |
| 51 |
--- a/media-gfx/photoqt/photoqt-2.9.1.ebuild |
| 52 |
+++ b/media-gfx/photoqt/photoqt-2.9.1-r1.ebuild |
| 53 |
@@ -37,7 +37,7 @@ COMMON_DEPEND=" |
| 54 |
!graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
| 55 |
graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
| 56 |
) |
| 57 |
- mpv? ( media-video/mpv[libmpv] ) |
| 58 |
+ mpv? ( media-video/mpv:=[libmpv] ) |
| 59 |
pdf? ( app-text/poppler[qt5] ) |
| 60 |
raw? ( media-libs/libraw:= ) |
| 61 |
" |
| 62 |
@@ -51,6 +51,10 @@ RDEPEND="${COMMON_DEPEND} |
| 63 |
" |
| 64 |
BDEPEND="dev-qt/linguist-tools:5" |
| 65 |
|
| 66 |
+PATCHES=( |
| 67 |
+ "${FILESDIR}"/${P}-libmpv-api2.patch |
| 68 |
+) |
| 69 |
+ |
| 70 |
src_configure() { |
| 71 |
local mycmakeargs=( |
| 72 |
-DCHROMECAST=OFF # TODO needs python |
Archives