From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7561C158021 for ; Mon, 7 Nov 2022 19:30:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E4E5E088B; Mon, 7 Nov 2022 19:30:25 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A0B0E088B for ; Mon, 7 Nov 2022 19:30:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78139340FBF for ; Mon, 7 Nov 2022 19:30:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C802970D for ; Mon, 7 Nov 2022 19:30:22 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1667849277.a1617dacbcaa34c7f89d56cd8a303ebefd6601c9.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/, media-gfx/photoqt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch media-gfx/photoqt/photoqt-2.9.1-r1.ebuild media-gfx/photoqt/photoqt-2.9.1.ebuild X-VCS-Directories: media-gfx/photoqt/ media-gfx/photoqt/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: a1617dacbcaa34c7f89d56cd8a303ebefd6601c9 X-VCS-Branch: master Date: Mon, 7 Nov 2022 19:30:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3d02299f-2e61-42a1-934c-f0ec93763c19 X-Archives-Hash: 19c62f7528ce80f4a44134ab6ae71fe5 commit: a1617dacbcaa34c7f89d56cd8a303ebefd6601c9 Author: Ionen Wolkens gentoo org> AuthorDate: Sun Nov 6 18:50:49 2022 +0000 Commit: Ionen Wolkens gentoo 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 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 +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(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