gentoo resync : 20.03.2022

3 files changed, 61 insertions, 15 deletions

diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 9e2ea5f80395..8eb0230aae4b 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,6 @@
+AUX krfb-21.12.2-optional-pipewire.patch 910 BLAKE2B 9e43a73004b463c592116c3e39038e2be0f8eea22340958283356a3f05347d4a3ee8a6bba8d93091502e9685e9db3a5d2d2b845fe5a6b8874e6f4602e6e5edff SHA512 0c527021bf9e2fe6f3b9a35f40c765f72e6d4c3af160ee770ff5cd5f506d72ebd5d05bcb4aa5ad0983839f2c230069d355ac1a8ba09bd3f415d47f9f8585925a
 DIST krfb-21.08.3.tar.xz 1293896 BLAKE2B a7d162e087b1792e68dbd18ca047e6d50256f0c1103665bcd57c5f7e2171aeba610f06dd92ff84a437b1ca79c0e48e4e5c5555e4cbbc872dcfe84c5d2eed5573 SHA512 2386b5bb08ce6e45d5ea43043a3b73aff52f0b82e6f464a2c8f29a5e82a90f745ae59716747e5f977f1099fb655bb4427c51a3f3498a1e42dc84e1e5fef40728
-DIST krfb-21.12.1.tar.xz 1302128 BLAKE2B f2e777ed6bcbe025e9f85ba30fb6621f75c934649a037d707fb9ae0b3eabddef8b0654bc97e9910badbb868b7416859402df2a5c229eabe2eca462fff2155336 SHA512 b11e3d8747af042ed2f958379f107e3428e02e16a5848ac00c0d096181581cd273f2a5c4f23663e3b069fd8dfb34d3f575853add88b03e0797f191f588e97272
+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.1.ebuild 1509 BLAKE2B 0ea81e2e22dfd68555c9b169dbfe127db542ffd4a0d973a7ad440f31ad77c7bad30433e735d05882666c4be1c267e89957ff8026b4c8ecc68c598bf56ac7641c SHA512 e58d3f559385a23e558c2a3007d432e9b36f2348db125d5115c9169f48e0e3374ae6e4044f94d179701ee90ec9ee7056ee46812828cd2a617bbf1ce01a00c284
+EBUILD krfb-21.12.3.ebuild 1918 BLAKE2B cf29d991556044473e801104132a190edaadad4913a19466c32f8394a3c5f28ae2b11c246b4a7b97e62139406ba95f8f2f897514744385bb3a31807015a32b66 SHA512 66da0920d5bb0256180631211fcdb8b0e4b518a5cb565fc4da475a9ef986367a6a0adc7cb2c8226159427a5afe3120f60c1a6a52c891f240957d43b9abd08417
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
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 000000000000..42efc93ee685
--- /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.1.ebuild b/kde-apps/krfb/krfb-21.12.3.ebuild
index a6011f97c5f0..6368e2221a41 100644
--- a/kde-apps/krfb/krfb-21.12.1.ebuild
+++ b/kde-apps/krfb/krfb-21.12.3.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}/${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
+}