From nobody Thu May 11 09:58:15 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QH6lq6b6Hz4B26M; Thu, 11 May 2023 09:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QH6lq4mwPz3rZH; Thu, 11 May 2023 09:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683799095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tdeGHr8Np9UUHXrltBznzV6Bz8kzilxfBnhCgKrY/gg=; b=vGZAFRqLk8dBQRXw+VqV7630LfjH/F0sVbc4mVLE8iq2yU8O79O72nzfMnXCAvynZQQG+s LJFWsyyfpCDV7jez8xtz3GNUmY3VoPwEqzkqY6rYpH5uegv7kWyfB/1UuiysmGklGr5Y8k 2qjod5Bm3DEoE15K324+SUwywwg+mvfAHNi8+m6kOnsCjZ3soL9d7Fw13pk7g4CSeEUMwZ KpxgKIrZtDgWXc1Zb6Rx/tfR+2YXVMRB8gZvNrO/n+vm9MbCTXa7wWzaFGEwiCR9oJQpHq bAXucqukQxgEKIKzHGJhPOtbz/btkKcpMDeecGHIrKjZT06lt3OrC8zls9gOdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683799095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tdeGHr8Np9UUHXrltBznzV6Bz8kzilxfBnhCgKrY/gg=; b=MrWBcYuEasfF8FbivCAjn0buGYAJ1CquL71+NAyod/P6feqqw9/BeJfB3JSzCGvQhnGOVA 0fAwoBMF9lJMsZq1ls5eru328+taYpebCGq5K8nX9cyOlWj9zdhTuofq5r7OR7PJNiB1Mo nhWbu5vhA0L8id5eE2fTi9AtZvEMO6gvpbDcsIrvyNXgKk04CJrZj4mqML+x0gPeQGpCbB 7pwXr3E4fJXdHP4K6lbvgwtVCVaHO5YOaqTgoOqQ9cYqMU42Y2eoUwLVR0AS4/LVorh9YZ 685jAX0Wt5Onrx4803otLyqWGHg57HH7+RWfgZpC2/P8Udhox+cvVkSSyL+2gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683799095; a=rsa-sha256; cv=none; b=ZA06w6/qWAccTegdt5qqw6W8gsa0UY6p0UWNK5IdUmM0OxOMdF/8u09N+IwK4woNH8/616 CcvwiyCV7sX09aRxoNeWK9WBS82wvZHJ80IzNlAvGR/oSUeJPtP+yYOCpZJ7j5E6Mpl7q8 EpRmDmhlnwauySUHAvdSCcRWhY2Uq3iAvGSv4u2Uj2LFS5hmyDpsGKCg48VEhWfWcS1hQs 7e7Ff85/7eXqSIDfF/tUakR5LdOdWGUmujtioVMy8oxnE6oLfZQp+M+Dr/eAchQVzdOyzc 7ihHeql8qvmN3QFBTnL+54plhN1Y3ARi40anUDFiXOds6bsVz12kO6R45d4tWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QH6lq3nt7znMG; Thu, 11 May 2023 09:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34B9wFCt014554; Thu, 11 May 2023 09:58:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B9wFSn014553; Thu, 11 May 2023 09:58:15 GMT (envelope-from git) Date: Thu, 11 May 2023 09:58:15 GMT Message-Id: <202305110958.34B9wFSn014553@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 3e6fe6466f50 - main - net/krfb: make pipewire optional List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e6fe6466f5021164ff3a0cdaea982bdf9b2b106 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e6fe6466f5021164ff3a0cdaea982bdf9b2b106 commit 3e6fe6466f5021164ff3a0cdaea982bdf9b2b106 Author: Vladimir Druzenko AuthorDate: 2023-05-11 09:54:28 +0000 Commit: Vladimir Druzenko CommitDate: 2023-05-11 09:57:22 +0000 net/krfb: make pipewire optional Keep it on by default. PR: 268761 Approved by: arrowd (mentor, kde@) Differential Revision: https://reviews.freebsd.org/D39976 --- net/krfb/Makefile | 18 +++++++++++------- net/krfb/pkg-plist | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/net/krfb/Makefile b/net/krfb/Makefile index ce65952f734c..22bf50f951fa 100644 --- a/net/krfb/Makefile +++ b/net/krfb/Makefile @@ -9,22 +9,26 @@ WWW= https://www.kde.org BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libvncserver.so:net/libvncserver \ - libxcb-image.so:x11/xcb-util-image \ - libpipewire-0.3.so:multimedia/pipewire + libxcb-image.so:x11/xcb-util-image USES= alias cmake compiler:c++11-lib gettext jpeg kde:5 pkgconfig \ qt:5 tar:xz xorg USE_KDE= auth codecs completion config configwidgets coreaddons crash \ - dbusaddons dnssd doctools i18n kpipewire notifications wallet \ + dbusaddons dnssd doctools i18n notifications wallet \ wayland widgetsaddons windowsystem xmlgui \ ecm:build USE_QT= core dbus gui network widgets x11extras xml \ buildtools:build qmake:build USE_XORG= x11 xcb xdamage xext xtst -OPTIONS_DEFINE= TELEPATHY DOCS -OPTIONS_SUB= yes -TELEPATHY_DESC= Support for Telepathy Tubes -TELEPATHY_LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt +OPTIONS_DEFINE= DOCS PIPEWIRE TELEPATHY +OPTIONS_DEFAULT= PIPEWIRE +OPTIONS_SUB= yes +PIPEWIRE_DESC= Screen capture via PipeWire +PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire +PIPEWIRE_USE= KDE=kpipewire +PIPEWIRE_CMAKE_BOOL_OFF= DISABLE_PIPEWIRE +TELEPATHY_DESC= Support for Telepathy Tubes +TELEPATHY_LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt .include diff --git a/net/krfb/pkg-plist b/net/krfb/pkg-plist index 3721f454c9a8..f4ab21d68fca 100644 --- a/net/krfb/pkg-plist +++ b/net/krfb/pkg-plist @@ -3,8 +3,8 @@ bin/krfb-virtualmonitor lib/libkrfbprivate.so.5 lib/libkrfbprivate.so.5.0 %%QT_PLUGINDIR%%/krfb/events/x11.so -%%QT_PLUGINDIR%%/krfb/events/xdp.so -%%QT_PLUGINDIR%%/krfb/framebuffer/pw.so +%%PIPEWIRE%%%%QT_PLUGINDIR%%/krfb/events/xdp.so +%%PIPEWIRE%%%%QT_PLUGINDIR%%/krfb/framebuffer/pw.so %%QT_PLUGINDIR%%/krfb/framebuffer/qt.so %%QT_PLUGINDIR%%/krfb/framebuffer/xcb.so share/applications/org.kde.krfb.desktop