From a1617dacbcaa34c7f89d56cd8a303ebefd6601c9 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Sun, 6 Nov 2022 13:50:49 -0500 Subject: 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 --- .../photoqt/files/photoqt-2.9.1-libmpv-api2.patch | 20 ++++++ media-gfx/photoqt/photoqt-2.9.1-r1.ebuild | 76 ++++++++++++++++++++++ media-gfx/photoqt/photoqt-2.9.1.ebuild | 72 -------------------- 3 files changed, 96 insertions(+), 72 deletions(-) create mode 100644 media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch create mode 100644 media-gfx/photoqt/photoqt-2.9.1-r1.ebuild delete mode 100644 media-gfx/photoqt/photoqt-2.9.1.ebuild (limited to 'media-gfx/photoqt') 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-r1.ebuild b/media-gfx/photoqt/photoqt-2.9.1-r1.ebuild new file mode 100644 index 000000000000..094f15dc4bbd --- /dev/null +++ b/media-gfx/photoqt/photoqt-2.9.1-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_KDEINSTALLDIRS=false +inherit ecm optfeature + +DESCRIPTION="Simple but powerful Qt-based image viewer" +HOMEPAGE="https://photoqt.org/" +SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="devil exif freeimage graphicsmagick imagemagick mpv pdf raw" + +COMMON_DEPEND=" + app-arch/libarchive:= + app-arch/unrar + dev-libs/pugixml + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5[jpeg] + dev-qt/qtimageformats:5 + dev-qt/qtmultimedia:5[qml] + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + devil? ( media-libs/devil ) + exif? ( media-gfx/exiv2:= ) + freeimage? ( media-libs/freeimage ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + mpv? ( media-video/mpv:=[libmpv] ) + pdf? ( app-text/poppler[qt5] ) + raw? ( media-libs/libraw:= ) +" +DEPEND="${COMMON_DEPEND} + dev-qt/qtconcurrent:5 +" +RDEPEND="${COMMON_DEPEND} + dev-qt/qtgraphicaleffects:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtquickcontrols2:5 +" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}"/${P}-libmpv-api2.patch +) + +src_configure() { + local mycmakeargs=( + -DCHROMECAST=OFF # TODO needs python + -DDEVIL=$(usex devil) + -DEXIV2=$(usex exif) + -DFREEIMAGE=$(usex freeimage) + -DGRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick)) + -DIMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick)) + -DVIDEO_MPV=$(usex mpv) + -DPOPPLER=$(usex pdf) + -DRAW=$(usex raw) + ) + ecm_src_configure +} + +pkg_postinst() { + optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." kde-frameworks/kimageformats + ecm_pkg_postinst +} diff --git a/media-gfx/photoqt/photoqt-2.9.1.ebuild b/media-gfx/photoqt/photoqt-2.9.1.ebuild deleted file mode 100644 index f73af804f930..000000000000 --- a/media-gfx/photoqt/photoqt-2.9.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_KDEINSTALLDIRS=false -inherit ecm optfeature - -DESCRIPTION="Simple but powerful Qt-based image viewer" -HOMEPAGE="https://photoqt.org/" -SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="devil exif freeimage graphicsmagick imagemagick mpv pdf raw" - -COMMON_DEPEND=" - app-arch/libarchive:= - app-arch/unrar - dev-libs/pugixml - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5[jpeg] - dev-qt/qtimageformats:5 - dev-qt/qtmultimedia:5[qml] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - devil? ( media-libs/devil ) - exif? ( media-gfx/exiv2:= ) - freeimage? ( media-libs/freeimage ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - ) - mpv? ( media-video/mpv[libmpv] ) - pdf? ( app-text/poppler[qt5] ) - raw? ( media-libs/libraw:= ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qtconcurrent:5 -" -RDEPEND="${COMMON_DEPEND} - dev-qt/qtgraphicaleffects:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtquickcontrols2:5 -" -BDEPEND="dev-qt/linguist-tools:5" - -src_configure() { - local mycmakeargs=( - -DCHROMECAST=OFF # TODO needs python - -DDEVIL=$(usex devil) - -DEXIV2=$(usex exif) - -DFREEIMAGE=$(usex freeimage) - -DGRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick)) - -DIMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick)) - -DVIDEO_MPV=$(usex mpv) - -DPOPPLER=$(usex pdf) - -DRAW=$(usex raw) - ) - ecm_src_configure -} - -pkg_postinst() { - optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." kde-frameworks/kimageformats - ecm_pkg_postinst -} -- cgit v1.2.3-65-gdbad