From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5B20158041 for ; Sun, 17 Mar 2024 16:35:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7295E29F4; Sun, 17 Mar 2024 16:35:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 927DFE29F3 for ; Sun, 17 Mar 2024 16:35:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6900B33F9FD for ; Sun, 17 Mar 2024 16:35:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D22D31555 for ; Sun, 17 Mar 2024 16:35:14 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1710693245.7b06ba9d0e31f7218cc5c0f3e712c437caacc298.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/freerdp/freerdp-2.11.5-r10.ebuild net-misc/freerdp/freerdp-2.9999.ebuild net-misc/freerdp/freerdp-3.4.0-r10.ebuild net-misc/freerdp/freerdp-9999.ebuild X-VCS-Directories: net-misc/freerdp/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 7b06ba9d0e31f7218cc5c0f3e712c437caacc298 X-VCS-Branch: master Date: Sun, 17 Mar 2024 16:35:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 09969462-60eb-4fd0-84fe-bda41b1df542 X-Archives-Hash: 6b412bd4b8ca880e7dddb7fcd6a4d1a6 commit: 7b06ba9d0e31f7218cc5c0f3e712c437caacc298 Author: Mike Gilbert gentoo org> AuthorDate: Sun Mar 17 15:45:39 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Mar 17 16:34:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b06ba9d net-misc/freerdp: enable wayland only with client Signed-off-by: Mike Gilbert gentoo.org> net-misc/freerdp/freerdp-2.11.5-r10.ebuild | 18 ++++++++++++++---- net-misc/freerdp/freerdp-2.9999.ebuild | 18 ++++++++++++++---- net-misc/freerdp/freerdp-3.4.0-r10.ebuild | 18 ++++++++++++++---- net-misc/freerdp/freerdp-9999.ebuild | 18 ++++++++++++++---- 4 files changed, 56 insertions(+), 16 deletions(-) diff --git a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild index febcc0e3d5c5..e3c30486ef78 100644 --- a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild +++ b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild @@ -80,9 +80,11 @@ COMMON_DEPEND=" ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) ) X? ( x11-libs/libX11 @@ -108,6 +110,14 @@ option() { usex "$1" ON OFF } +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + src_configure() { # bug #881695 filter-lto @@ -141,7 +151,7 @@ src_configure() { -DWITH_X11=$(option X) -DWITH_XINERAMA=$(option xinerama) -DWITH_XV=$(option xv) - -DWITH_WAYLAND=$(option wayland) + -DWITH_WAYLAND=$(option_client wayland) -DWITH_WINPR_TOOLS=$(option tools) ) cmake_src_configure diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index 018ae103d0e0..035df26f5b1e 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -80,9 +80,11 @@ COMMON_DEPEND=" ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) ) X? ( x11-libs/libX11 @@ -103,6 +105,14 @@ option() { usex "$1" ON OFF } +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + src_configure() { # bug #881695 filter-lto @@ -136,7 +146,7 @@ src_configure() { -DWITH_X11=$(option X) -DWITH_XINERAMA=$(option xinerama) -DWITH_XV=$(option xv) - -DWITH_WAYLAND=$(option wayland) + -DWITH_WAYLAND=$(option_client wayland) -DWITH_WINPR_TOOLS=$(option tools) ) cmake_src_configure diff --git a/net-misc/freerdp/freerdp-3.4.0-r10.ebuild b/net-misc/freerdp/freerdp-3.4.0-r10.ebuild index 93c7a794de74..1821299544d6 100644 --- a/net-misc/freerdp/freerdp-3.4.0-r10.ebuild +++ b/net-misc/freerdp/freerdp-3.4.0-r10.ebuild @@ -86,9 +86,11 @@ COMMON_DEPEND=" sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) ) X? ( x11-libs/libX11 @@ -109,6 +111,14 @@ option() { usex "$1" ON OFF } +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + src_configure() { # bug #881695 filter-lto @@ -152,7 +162,7 @@ src_configure() { -DWITH_X11=$(option X) -DWITH_XINERAMA=$(option xinerama) -DWITH_XV=$(option xv) - -DWITH_WAYLAND=$(option wayland) + -DWITH_WAYLAND=$(option_client wayland) -DWITH_WEBVIEW=OFF -DWITH_WINPR_TOOLS=$(option tools) ) diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 93c7a794de74..1821299544d6 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -86,9 +86,11 @@ COMMON_DEPEND=" sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) ) X? ( x11-libs/libX11 @@ -109,6 +111,14 @@ option() { usex "$1" ON OFF } +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + src_configure() { # bug #881695 filter-lto @@ -152,7 +162,7 @@ src_configure() { -DWITH_X11=$(option X) -DWITH_XINERAMA=$(option xinerama) -DWITH_XV=$(option xv) - -DWITH_WAYLAND=$(option wayland) + -DWITH_WAYLAND=$(option_client wayland) -DWITH_WEBVIEW=OFF -DWITH_WINPR_TOOLS=$(option tools) )