diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-02-02 20:33:42 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-02-02 20:33:46 +0100 |
commit | db44558034838ac7e7f8ee9237fc27cb830461f0 (patch) | |
tree | 1b0eda09e1ac22b5b7de5a0ed2dd4f2fa24333c8 | |
parent | kde-apps/kdenlive: Add missing dev-qt/qtdeclarative[widgets] usedep (diff) | |
download | kde-db445580.tar.gz kde-db445580.tar.bz2 kde-db445580.zip |
kde-apps/krfb: Re-add IUSE=wayland
Upstream commit 1222c2067ccaeef69878bd3101fc579011b3e191
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r-- | kde-apps/krfb/files/krfb-21.12.2-optional-pipewire.patch | 28 | ||||
-rw-r--r-- | kde-apps/krfb/krfb-21.12.2.ebuild | 43 | ||||
-rw-r--r-- | kde-apps/krfb/krfb-21.12.49.9999.ebuild | 43 | ||||
-rw-r--r-- | kde-apps/krfb/krfb-9999.ebuild | 41 |
4 files changed, 116 insertions, 39 deletions
diff --git a/kde-apps/krfb/files/krfb-21.12.2-optional-pipewire.patch b/kde-apps/krfb/files/krfb-21.12.2-optional-pipewire.patch new file mode 100644 index 0000000000..42efc93ee6 --- /dev/null +++ b/kde-apps/krfb/files/krfb-21.12.2-optional-pipewire.patch @@ -0,0 +1,28 @@ +From 1222c2067ccaeef69878bd3101fc579011b3e191 Mon Sep 17 00:00:00 2001 +From: Luke Dashjr <luke-jr+git@utopios.org> +Date: Mon, 24 Jan 2022 01:35:21 +0000 +Subject: [PATCH] Add CMake option DISABLE_PIPEWIRE to skip dependency check + +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f8241f..01e6f57 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -79,7 +79,10 @@ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ) + find_package(LibVNCServer REQUIRED) + + +-pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3) ++option(DISABLE_PIPEWIRE "Disable PipeWire support." OFF) ++if(NOT DISABLE_PIPEWIRE) ++ pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3) ++endif() + add_feature_info(PipeWire PipeWire_FOUND "Required for pipewire screencast plugin") + find_package(PlasmaWaylandProtocols 1.5.0) + +-- +GitLab + diff --git a/kde-apps/krfb/krfb-21.12.2.ebuild b/kde-apps/krfb/krfb-21.12.2.ebuild index a6011f97c5..eddcd8ff9b 100644 --- a/kde-apps/krfb/krfb-21.12.2.ebuild +++ b/kde-apps/krfb/krfb-21.12.2.ebuild @@ -14,18 +14,11 @@ HOMEPAGE="https://apps.kde.org/krfb/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" +IUSE="wayland" COMMON_DEPEND=" - >=dev-libs/plasma-wayland-protocols-1.5.0 - dev-libs/wayland >=dev-qt/qtdbus-${QTMIN}:5 - || ( - >=dev-qt/qtgui-${QTMIN}:5[libinput] - >=dev-qt/qtgui-${QTMIN}:5[X] - ) >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 @@ -41,18 +34,42 @@ COMMON_DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-libs/libepoxy - media-libs/mesa[gbm(+)] - >=media-video/pipewire-0.3:= >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb 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 + media-libs/libepoxy + media-libs/mesa[gbm(+)] + >=media-video/pipewire-0.3:= + ) " DEPEND="${COMMON_DEPEND} - media-libs/libglvnd + wayland? ( + >=dev-libs/plasma-wayland-protocols-1.5.0 + media-libs/libglvnd + ) " RDEPEND="${COMMON_DEPEND} - sys-apps/xdg-desktop-portal[screencast] + wayland? ( sys-apps/xdg-desktop-portal[screencast] ) " + +PATCHES=( "${FILESDIR}/${P}-optional-pipewire.patch" ) + +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 +} diff --git a/kde-apps/krfb/krfb-21.12.49.9999.ebuild b/kde-apps/krfb/krfb-21.12.49.9999.ebuild index d3256ed5fc..459aee1c0d 100644 --- a/kde-apps/krfb/krfb-21.12.49.9999.ebuild +++ b/kde-apps/krfb/krfb-21.12.49.9999.ebuild @@ -14,18 +14,11 @@ HOMEPAGE="https://apps.kde.org/krfb/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="" +IUSE="wayland" COMMON_DEPEND=" - >=dev-libs/plasma-wayland-protocols-1.5.0 - dev-libs/wayland >=dev-qt/qtdbus-${QTMIN}:5 - || ( - >=dev-qt/qtgui-${QTMIN}:5[libinput] - >=dev-qt/qtgui-${QTMIN}:5[X] - ) >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 @@ -41,18 +34,42 @@ COMMON_DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-libs/libepoxy - media-libs/mesa[gbm(+)] - >=media-video/pipewire-0.3:= >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb 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 + media-libs/libepoxy + media-libs/mesa[gbm(+)] + >=media-video/pipewire-0.3:= + ) " DEPEND="${COMMON_DEPEND} - media-libs/libglvnd + wayland? ( + >=dev-libs/plasma-wayland-protocols-1.5.0 + media-libs/libglvnd + ) " RDEPEND="${COMMON_DEPEND} - sys-apps/xdg-desktop-portal[screencast] + wayland? ( sys-apps/xdg-desktop-portal[screencast] ) " + +PATCHES=( "${FILESDIR}/${PN}-21.12.2-optional-pipewire.patch" ) + +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 +} diff --git a/kde-apps/krfb/krfb-9999.ebuild b/kde-apps/krfb/krfb-9999.ebuild index d3256ed5fc..00cd6ffc44 100644 --- a/kde-apps/krfb/krfb-9999.ebuild +++ b/kde-apps/krfb/krfb-9999.ebuild @@ -14,18 +14,11 @@ HOMEPAGE="https://apps.kde.org/krfb/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="" +IUSE="wayland" COMMON_DEPEND=" - >=dev-libs/plasma-wayland-protocols-1.5.0 - dev-libs/wayland >=dev-qt/qtdbus-${QTMIN}:5 - || ( - >=dev-qt/qtgui-${QTMIN}:5[libinput] - >=dev-qt/qtgui-${QTMIN}:5[X] - ) >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 @@ -41,18 +34,40 @@ COMMON_DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-libs/libepoxy - media-libs/mesa[gbm(+)] - >=media-video/pipewire-0.3:= >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb 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 + media-libs/libepoxy + media-libs/mesa[gbm(+)] + >=media-video/pipewire-0.3:= + ) " DEPEND="${COMMON_DEPEND} - media-libs/libglvnd + wayland? ( + >=dev-libs/plasma-wayland-protocols-1.5.0 + media-libs/libglvnd + ) " RDEPEND="${COMMON_DEPEND} - sys-apps/xdg-desktop-portal[screencast] + wayland? ( sys-apps/xdg-desktop-portal[screencast] ) " + +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 +} |