diff options
Diffstat (limited to 'kde-apps/krfb')
-rw-r--r-- | kde-apps/krfb/Manifest | 6 | ||||
-rw-r--r-- | kde-apps/krfb/krfb-21.12.3-r1.ebuild | 9 | ||||
-rw-r--r-- | kde-apps/krfb/krfb-22.04.0.ebuild (renamed from kde-apps/krfb/krfb-21.08.3.ebuild) | 36 |
3 files changed, 29 insertions, 22 deletions
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest index d4fd7f4cc016..fa5b7a2671ca 100644 --- a/kde-apps/krfb/Manifest +++ b/kde-apps/krfb/Manifest @@ -1,7 +1,7 @@ AUX krfb-21.12.2-optional-pipewire.patch 910 BLAKE2B 9e43a73004b463c592116c3e39038e2be0f8eea22340958283356a3f05347d4a3ee8a6bba8d93091502e9685e9db3a5d2d2b845fe5a6b8874e6f4602e6e5edff SHA512 0c527021bf9e2fe6f3b9a35f40c765f72e6d4c3af160ee770ff5cd5f506d72ebd5d05bcb4aa5ad0983839f2c230069d355ac1a8ba09bd3f415d47f9f8585925a AUX krfb-21.12.3-optional-wayland.patch 1083 BLAKE2B c546e68fc1126c12ba286bf2a6b2c583491b97112c23aa93820989b71adf2695e2e7a16dbcd5e55b9ac98a61da4b16d454b47d7e2e847f7689f2b3a5a5f6ff81 SHA512 74031ee200d67bc64463031d0e3bb0ab031cdbd62ea8982cb467fdd752dc23165032b429b6bf857cc73dc48a772d50f3fb0687d5f904dfd2eb7e886818601491 -DIST krfb-21.08.3.tar.xz 1293896 BLAKE2B a7d162e087b1792e68dbd18ca047e6d50256f0c1103665bcd57c5f7e2171aeba610f06dd92ff84a437b1ca79c0e48e4e5c5555e4cbbc872dcfe84c5d2eed5573 SHA512 2386b5bb08ce6e45d5ea43043a3b73aff52f0b82e6f464a2c8f29a5e82a90f745ae59716747e5f977f1099fb655bb4427c51a3f3498a1e42dc84e1e5fef40728 DIST krfb-21.12.3.tar.xz 1302484 BLAKE2B 05ad97456acbf20251ad46525e37e78f5bcfb869382b33003ad9fdc18d006741216ceb15834c692dede6478d22812f84734530506bc54aef8bfa2508d6ba9b05 SHA512 b365259391aaf7870ef87566b82354119aea60303e104ea5c5b82c28ad135ac66b3687638c28af997ade2851989d4d1bb0a455bd241a3aeaa1475e032442071e -EBUILD krfb-21.08.3.ebuild 1596 BLAKE2B 570063b4fb1824b15b473ccc45604eaf193d958c2460db46d41b9fb872bb98b87430b38cbb7260511a8e563c614dd1c06070e32f4f4d30e35c92ae03022b266b SHA512 d807b381ca5d3940d49a483babd3a9a99645ccdbdd9252f1a63b00fe12b1354fb03da38bdf66a0b3505787697dba0555ac0e90864c9bb894037ebaa5a8eaf7f8 -EBUILD krfb-21.12.3-r1.ebuild 2101 BLAKE2B 8828343aa6e5682bb1d31a5b9444b1576ca231d6836744b794be0818ab1e789a929ad60f5e44721967d6f7ffec0e69f71dd12fea7dba57a537ce355dc2c6bcf6 SHA512 db32c2f0386cfa81daa4a1e9b755966bc53347978466fa91200e2b294e5c5172ed3e3ce6ce4575b4f8609cd2bdd01e0dbf2435d6fb75fd900e3e9fab86eca5e6 +DIST krfb-22.04.0.tar.xz 1302844 BLAKE2B 1b0269415ac6b73e9c74191e11390d06a36ab1ef96e425a8dfee0bee2d9b08f3c21f1d6accf57ad3614b756f58e89d710b089a96db98bb350f41cb9d762f2d15 SHA512 f8192d83f00c55afc2f27f2bd4fb71f26820b288b9f0afc109169b3e744f299e2fe025ec72d8ed25c8a57fb5fada7fc9fa47fda688180cd2efc6693fa1deb315 +EBUILD krfb-21.12.3-r1.ebuild 2058 BLAKE2B 694020d4a3b9bdb056ccd4780cce7774339ad8e74bf4a6481a62307c1578a04efa0f74d004ebe3a0698db7b28e3d40504903d9e961556d93485b5d8410dee7f4 SHA512 b5f66ea43041e21d4760f22bd208537845f4145145198627c509df48291a5fe8416b73fc4c3149eebad2d55568227cced29f38adb90990d72d3875cb77bafa5f +EBUILD krfb-22.04.0.ebuild 1952 BLAKE2B afbca3bb0b025eff3d19e772d3c27ebc5f382ab0f8c8fba66959c71feb24bc939f1b7dcca32d6ff52a9651c547a50c54bbd900ad48e2f347856b831f75c4cd4c SHA512 5ea9405892713b2500b95d5e633a048a0545a7652950d9e948417ef343737df372d087b76e6e208365de5ab273d3ab4c622664bb5bc2208adcad3c2a1076e6b9 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/krfb/krfb-21.12.3-r1.ebuild b/kde-apps/krfb/krfb-21.12.3-r1.ebuild index 6f6a08686ca1..a2be6288efa6 100644 --- a/kde-apps/krfb/krfb-21.12.3-r1.ebuild +++ b/kde-apps/krfb/krfb-21.12.3-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/krfb/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" IUSE="wayland" COMMON_DEPEND=" @@ -61,12 +61,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} wayland? ( sys-apps/xdg-desktop-portal[screencast] ) " -BDEPEND=" - wayland? ( || ( - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - <dev-qt/qtwayland-5.15.3:5 - ) ) -" +BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )" PATCHES=( "${FILESDIR}/${PN}-21.12.2-optional-pipewire.patch" diff --git a/kde-apps/krfb/krfb-21.08.3.ebuild b/kde-apps/krfb/krfb-22.04.0.ebuild index 19c498033408..220753f9f3cd 100644 --- a/kde-apps/krfb/krfb-21.08.3.ebuild +++ b/kde-apps/krfb/krfb-22.04.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.84.0 +KFMIN=5.92.0 QTMIN=5.15.2 inherit ecm kde.org @@ -13,12 +13,11 @@ HOMEPAGE="https://apps.kde.org/krfb/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="wayland" COMMON_DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 @@ -41,23 +40,36 @@ COMMON_DEPEND=" x11-libs/libXtst x11-libs/xcb-util-image wayland? ( + dev-libs/wayland + || ( + >=dev-qt/qtgui-${QTMIN}:5[libinput] + >=dev-qt/qtgui-${QTMIN}:5[X] + ) + >=dev-qt/qtwayland-${QTMIN}:5 + >=kde-frameworks/kwayland-${KFMIN}:5 media-libs/libepoxy media-libs/mesa[gbm(+)] >=media-video/pipewire-0.3:= ) " DEPEND="${COMMON_DEPEND} - wayland? ( media-libs/libglvnd ) + wayland? ( + >=dev-libs/plasma-wayland-protocols-1.5.0 + media-libs/libglvnd + ) " RDEPEND="${COMMON_DEPEND} wayland? ( sys-apps/xdg-desktop-portal[screencast] ) " +BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )" -src_prepare() { - ecm_src_prepare - - # TODO: try to get a build switch upstreamed - if ! use wayland; then - sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die - fi +src_configure() { + local mycmakeargs=( + -DDISABLE_PIPEWIRE=$(usex !wayland) + $(cmake_use_find_package wayland PlasmaWaylandProtocols) + $(cmake_use_find_package wayland gbm) + $(cmake_use_find_package wayland EGL) + $(cmake_use_find_package wayland epoxy) + ) + ecm_src_configure } |