From nobody Tue May 16 15:41:41 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 4QLL7p18Tdz4B9MG; Tue, 16 May 2023 15:41:42 +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 4QLL7p0jXwz3r6k; Tue, 16 May 2023 15:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684251702; 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=zMaUJwxvk8geiKb9NIz7gcM1aL/TGr0P+MMhDkbJ5JI=; b=J8wgor/rOz3znWdFsm2NOgARIQB+OYqMPVP1cScW8SBBbar0eQanPBIrA0AitjzwukSwvi kDQW4luZW+XkaGgaGgTXFmU27CR+5Tuw9rRw6tBXOrka4N1UwsRK9RFpQU8fl8XTNIjviS zcA214UrltgUF2GvwFtDDmYzfJac1DpLDIJ8AXiPfBVggoYhmmBrzLPf7VuYkP/mcfqlwi 3Z4hQ4Bzg1zFhunZ2Q3C8zB9WaaGNQCjCrbhTlDZnUIi6aJ5xNuKEcWJqnHhXzpGqgq4X3 Rww39lWtKe5AsI9+P/ZeFvpGuwaDJ++IfTy+L5KjfI0D4bXLq9xFjyrydDNB7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684251702; 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=zMaUJwxvk8geiKb9NIz7gcM1aL/TGr0P+MMhDkbJ5JI=; b=RHBp8kq25HfAMgvgbG0VKbhmB5vhriT8BucIClJgkcvzfO5z7seEdmB56xLXdFj6Bv//02 UkwxbahdtLSybT2NKRZNXJvrbLCNqMm9h2XXKUJ7ty+BTeg9iy0SIShHxf54w2K37wyDww vO6+M/8DAvJpSFRgCG4lKhtVVN8d7doKY2zeaxyW5wZvGLoHbD3u6MWX2lP72OUASg0/Pm NGW37jVgn3028gFP2R6AvxP892oNaMKPMxycynQwY5skk6z28JHz3toPi3TeM5wuqj4vGI ehT3DHKEYzXDvfXffM4JWTOoX6GsI/UMD89VbM3twqGB3317D1m6ydbufNFaug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684251702; a=rsa-sha256; cv=none; b=vN3NF72rVAdK1R7gV6bMk0l+LAJHw4Alxh7dhbEbVTiERLQ4cKBhrwWZ1E4Toq56Umfxnh jTRIlHKRIT1xu5hONxwj3fmy2KmzgTq7Rup+hPhzqaKDlriPXW0chU1fGhWRB+vrBtMspK YLqFgnK8dXqGigABn7DluG6Qy39oNj2FYtDCZYVP6n2awPvXrqnF3z6qYnJVrgMbVs8K0G KFJk/W3NTfU8OS5EzRZeOciz74lJ9hCAsNzNW5Ci1RT7GvGOYkktZbdpIM//ZRtz5LNr+2 XGC6+1AmS1fKcBd151kGs0joN2wagIRKRQdkuOXPOX6se6xhcY1cNZcPAI2DZw== 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 4QLL7n6tt3zSnL; Tue, 16 May 2023 15:41:41 +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 34GFffQd040515; Tue, 16 May 2023 15:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34GFffHh040514; Tue, 16 May 2023 15:41:41 GMT (envelope-from git) Date: Tue, 16 May 2023 15:41:41 GMT Message-Id: <202305161541.34GFffHh040514@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: 68e029f386b5 - main - graphics/spectacle: 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: 68e029f386b5d1815a7e7792c98e0273cbe959f5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=68e029f386b5d1815a7e7792c98e0273cbe959f5 commit 68e029f386b5d1815a7e7792c98e0273cbe959f5 Author: Vladimir Druzenko AuthorDate: 2023-05-16 15:29:58 +0000 Commit: Vladimir Druzenko CommitDate: 2023-05-16 15:41:20 +0000 graphics/spectacle: make pipewire optional New build option PIPEWIRE, ON by default (as was before). PR: 270982 Approved by: arrowd (mentor, kde) Differential Revision: https://reviews.freebsd.org/D39978 --- graphics/spectacle/Makefile | 9 ++- graphics/spectacle/files/extra-patch-pipewire-off | 94 +++++++++++++++++++++++ 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/graphics/spectacle/Makefile b/graphics/spectacle/Makefile index a1ff27f3ce81..37cf793ee578 100644 --- a/graphics/spectacle/Makefile +++ b/graphics/spectacle/Makefile @@ -17,7 +17,7 @@ USES= cmake compiler:c++11-lang gettext kde:5 pkgconfig qt:5 tar:xz \ xorg USE_KDE= attica auth codecs completion config configwidgets coreaddons \ dbusaddons globalaccel guiaddons i18n jobwidgets kdeclarative \ - kio kpipewire libkipi newstuff notifications package purpose \ + kio libkipi newstuff notifications package purpose \ service solid wayland widgetsaddons windowsystem xmlgui \ doctools:build ecm:build USE_QT= concurrent core dbus declarative gui network printsupport \ @@ -25,6 +25,11 @@ USE_QT= concurrent core dbus declarative gui network printsupport \ buildtools:build qmake:build testlib:build USE_XORG= x11 xcb xext xfixes -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS PIPEWIRE +OPTIONS_DEFAULT= PIPEWIRE +PIPEWIRE_DESC= Screen capture via PipeWire +PIPEWIRE_USE= KDE=kpipewire +PIPEWIRE_CMAKE_BOOL_OFF= DISABLE_PIPEWIRE +PIPEWIRE_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-pipewire-off .include diff --git a/graphics/spectacle/files/extra-patch-pipewire-off b/graphics/spectacle/files/extra-patch-pipewire-off new file mode 100644 index 000000000000..b5dd3843f7ff --- /dev/null +++ b/graphics/spectacle/files/extra-patch-pipewire-off @@ -0,0 +1,94 @@ +--- CMakeLists.txt.orig 2023-05-09 03:35:10 UTC ++++ CMakeLists.txt +@@ -74,10 +74,14 @@ find_package(PlasmaWaylandProtocols REQUIRED) + if (QT_MAJOR_VERSION EQUAL "5") + find_package(QtWaylandScanner REQUIRED) + endif() +-find_package(KPipeWire) ++option(DISABLE_PIPEWIRE "Disable PipeWire support." OFF) ++if(NOT DISABLE_PIPEWIRE) ++ find_package(KPipeWire REQUIRED) ++ set(PIPEWIRE_FOUND 1) ++endif() + set_package_properties(KPipeWire PROPERTIES DESCRIPTION + "Used to record pipewire streams into a file" +- TYPE REQUIRED ++ TYPE OPTIONAL + ) + + # optional components +--- src/CMakeLists.txt.orig 2023-05-09 03:35:10 UTC ++++ src/CMakeLists.txt +@@ -9,6 +9,10 @@ kconfig_add_kcfg_files(SPECTACLE_SRCS GENERATE_MOC Gui + ecm_qt_declare_logging_category(SPECTACLE_SRCS HEADER spectacle_core_debug.h IDENTIFIER SPECTACLE_CORE_LOG CATEGORY_NAME org.kde.spectacle.core DESCRIPTION "spectacle (core)" EXPORT SPECTACLE) + ecm_qt_declare_logging_category(SPECTACLE_SRCS HEADER spectacle_gui_debug.h IDENTIFIER SPECTACLE_GUI_LOG CATEGORY_NAME org.kde.spectacle.gui DESCRIPTION "spectacle (gui)" EXPORT SPECTACLE) + ++if(PIPEWIRE_FOUND) ++ list(APPEND SPECTACLE_SRCS Platforms/VideoPlatformWayland.cpp) ++endif() ++ + add_executable(spectacle + ${SPECTACLE_SRCS} + Main.cpp +@@ -45,7 +49,6 @@ add_executable(spectacle + Platforms/PlatformKWinWayland.cpp + Platforms/PlatformKWinWayland2.cpp + Platforms/VideoPlatform.cpp +- Platforms/VideoPlatformWayland.cpp + Platforms/screencasting.cpp + + ../resources.qrc +@@ -84,6 +87,10 @@ endif() + + ki18n_wrap_ui(spectacle Gui/SettingsDialog/GeneralOptions.ui Gui/SettingsDialog/SaveOptions.ui) + ++if(PIPEWIRE_FOUND) ++ target_link_libraries(spectacle K::KPipeWireRecord) ++endif() ++ + target_link_libraries( + spectacle + Qt::Concurrent +@@ -107,7 +114,6 @@ target_link_libraries( + KF${QT_MAJOR_VERSION}::XmlGui + KF${QT_MAJOR_VERSION}::GuiAddons + KF${QT_MAJOR_VERSION}::Kirigami2 +- K::KPipeWireRecord + Wayland::Client + ) + +--- src/Config.h.in.orig 2023-05-16 10:09:13 UTC ++++ src/Config.h.in +@@ -7,6 +7,9 @@ + /* Define to 1 if we have Purpose */ + #cmakedefine PURPOSE_FOUND 1 + ++/* Define to 1 if we are building with PIPEWIRE */ ++#cmakedefine PIPEWIRE_FOUND 1 ++ + /* Set the Spectacle version from CMake */ + #cmakedefine SPECTACLE_VERSION "@SPECTACLE_VERSION@" + +--- src/Platforms/PlatformLoader.cpp.orig 2023-05-09 03:35:10 UTC ++++ src/Platforms/PlatformLoader.cpp +@@ -10,7 +10,9 @@ + #include "PlatformKWinWayland.h" + #include "PlatformKWinWayland2.h" + #include "PlatformNull.h" ++#ifdef PIPEWIRE_FOUND + #include "VideoPlatformWayland.h" ++#endif + + #ifdef XCB_FOUND + #include "PlatformXcb.h" +@@ -44,8 +46,10 @@ PlatformPtr loadPlatform() + + VideoPlatformPtr loadVideoPlatform() + { ++#ifdef PIPEWIRE_FOUND + if (KWindowSystem::isPlatformWayland()) { + return std::make_unique(); + } ++#endif + return std::make_unique(); + }