From nobody Tue Jan 9 14:12:23 2024 X-Original-To: dev-commits-ports-all@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 4T8Xtw0jvMz55MNg; Tue, 9 Jan 2024 14:12:24 +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 4T8Xtw0GTcz55vg; Tue, 9 Jan 2024 14:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704809544; 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=4JnYifkeMmvbN3Q4FFCwaJuZ/+q9yYiak5g/4heh9t0=; b=WNfbUettUvKmCSViiDtnAbLWQKhH07fuKNJ7frOMu44PmsBURLFoDQ7l8QE2YgvkTxlsxW MZtSFXWwpJP2jXQVdAGyXGBKyrVNh9vTY7s+adG+UPPumZPIWW5v2zvWv75m+qQHB0MrIk VZ261wXSkDZZwd3+KDsYPkB80QWkSiph1XXTB/ENaBNvpZeOf95sReYrNa9Dk5sCJPk6CM wiTuLHEQPS0GTkx4q3rs5aUfHbCFmYqsnrrEGgTCZznl1E0J65T8rwIFkQlDq/YhqJ5veT 4dSP5oShSeej/cuk9LA/EycjeZsZA1mn61A5ZrHGpC1BfGNPMXDm+NvCV5rKow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704809544; 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=4JnYifkeMmvbN3Q4FFCwaJuZ/+q9yYiak5g/4heh9t0=; b=AZkl7gcxnGMU/WZjkXKiA1+ap3akEwdp5BgYa0qXmY8l2GZ6XqmLZFWPYSnjRauppnHf1b v8kPuwKUfu8o+sgy3PxEaD3p6FsvtCYgMzL5Ak9uA5FaGQRccNg70ru1VAHeVqGDqUApB6 iIXeiLnjkT6jbOQZKRpy1FnMNHp3oDcHhtv4BiwdFQAI5Tqe+Bp0e0L5rLNc5cEXEKWbTb hDTL7CcnLD4hnVlblu1IL1fQK5i5ihwNUpKIzazC5lSBpVtfU0P1U5vbFZCF7zA4lSJSU2 fa9IFUIVYAT3dAXHCrbo7a+L7N4FUZpw9nHIuSYCGcOeOpqmJ4qjrM9UPFz1gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704809544; a=rsa-sha256; cv=none; b=Ww1cUzaTG4rhS64olJVCsRd6mvKCWLdBsKorba9XLgkJK7uqQWNJYAabb3AoEdHxr0lvje de0WJpkzW+DM8McghReNWqUE9oGnLvufKciX9OL14z72gdv1Kb9xPqX/cXEvuyiG4jhN2h xaRuV841sYacIIlGyib104MCeAQSQr7KxJ+UfwWko1aal+WZlNxulMjSLrgY919jdUFPEo NgdGphqrb+XdDl5cWQ0nPLmBkAfhd2dhG/PiaiI2glXsxFJa9EfkO9kZexxbz5NW+NE0Iq NAJe40FriKvI9V6lGdXpe5M0N7lwXgWFrbhglKvV+w7LqkuW6ln+fpcmfCx1NQ== 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 4T8Xtv6S18ztp4; Tue, 9 Jan 2024 14:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 409ECN3F009703; Tue, 9 Jan 2024 14:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 409ECNts009700; Tue, 9 Jan 2024 14:12:23 GMT (envelope-from git) Date: Tue, 9 Jan 2024 14:12:23 GMT Message-Id: <202401091412.409ECNts009700@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: 2b572e9b4f09 - main - x11-wm/plasma5-kwin: add option PIPEWIRE to allow build without pipewire List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 2b572e9b4f09c26fba986db6a625405cc2accea4 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b572e9b4f09c26fba986db6a625405cc2accea4 commit 2b572e9b4f09c26fba986db6a625405cc2accea4 Author: Vladimir Druzenko AuthorDate: 2024-01-09 14:09:40 +0000 Commit: Vladimir Druzenko CommitDate: 2024-01-09 14:09:40 +0000 x11-wm/plasma5-kwin: add option PIPEWIRE to allow build without pipewire Default ON - same as was before. Approved by: arrowd (kde, mentor) Differential Revision: https://reviews.freebsd.org/D41863 --- x11-wm/plasma5-kwin/Makefile | 9 +++++++-- x11-wm/plasma5-kwin/files/patch-CMakeLists.txt | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile index 1f82fa16f473..2d6830b7666b 100644 --- a/x11-wm/plasma5-kwin/Makefile +++ b/x11-wm/plasma5-kwin/Makefile @@ -22,8 +22,7 @@ LIB_DEPENDS= libdrm.so:graphics/libdrm \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxkbcommon.so:x11/libxkbcommon \ - libxcvt.so:x11/libxcvt \ - libpipewire-0.3.so:multimedia/pipewire + libxcvt.so:x11/libxcvt BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ xwayland-devel>0:x11-servers/xwayland-devel \ wayland-protocols>0:graphics/wayland-protocols \ @@ -55,6 +54,12 @@ SHEBANG_FILES= kconf_update/*.py \ kconf_update/*.pl \ src/effects/strip-effect-metadata.py +OPTIONS_DEFINE= PIPEWIRE +OPTIONS_DEFAULT= PIPEWIRE +PIPEWIRE_DESC= Required for Wayland screencasting +PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire +PIPEWIRE_CMAKE_BOOL= KWIN_BUILD_PIPEWIRE + # A (hopefully) temporary workaround for # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2026 post-patch: diff --git a/x11-wm/plasma5-kwin/files/patch-CMakeLists.txt b/x11-wm/plasma5-kwin/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..73169cc0813a --- /dev/null +++ b/x11-wm/plasma5-kwin/files/patch-CMakeLists.txt @@ -0,0 +1,17 @@ +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -394,9 +394,12 @@ + HAVE_SCHED_RESET_ON_FORK + "Required for running kwin_wayland with real-time scheduling") + + +-pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3>=0.3.29) +-add_feature_info(PipeWire PipeWire_FOUND "Required for Wayland screencasting") ++option(KWIN_BUILD_PIPEWIRE "Required for Wayland screencasting" ON) ++if (KWIN_BUILD_PIPEWIRE) ++ pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3>=0.3.29 REQUIRED) ++ add_feature_info(PipeWire PipeWire_FOUND "Required for Wayland screencasting") ++endif() + + if (KWIN_BUILD_NOTIFICATIONS) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Notifications)