commit: 0393a3eaaf1b9807d04c6688dde7b234f4ba144e Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Mar 16 16:35:32 2024 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Mar 17 16:33:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0393a3ea
net-misc/freerdp: add slots Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> ...rdp-2.9999.ebuild => freerdp-2.11.5-r10.ebuild} | 37 +++++++++++++++------- net-misc/freerdp/freerdp-2.9999.ebuild | 30 +++++++++++------- ...dp-3.4.0-r2.ebuild => freerdp-3.4.0-r10.ebuild} | 25 +++++++++------ net-misc/freerdp/freerdp-9999.ebuild | 25 +++++++++------ net-misc/freerdp/metadata.xml | 2 ++ 5 files changed, 78 insertions(+), 41 deletions(-) diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild similarity index 82% copy from net-misc/freerdp/freerdp-2.9999.ebuild copy to net-misc/freerdp/freerdp-2.11.5-r10.ebuild index 6e2277b4bffe..fdad406de1cd 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild @@ -22,11 +22,19 @@ DESCRIPTION="Free implementation of the Remote Desktop Protocol" HOMEPAGE="https://www.freerdp.com/"; LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" +SLOT="2" +IUSE="alsa cpu_flags_arm_neon client cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test tools usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -RDEPEND=" +BDEPEND=" + virtual/pkgconfig + X? ( doc? ( + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + ) ) +" + +COMMON_DEPEND=" dev-libs/openssl:0= sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) @@ -52,7 +60,7 @@ RDEPEND=" gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 - X? ( x11-libs/libXrandr ) + x11-libs/libXrandr ) icu? ( dev-libs/icu:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) @@ -81,18 +89,21 @@ RDEPEND=" x11-libs/libxkbfile ) " -DEPEND=" - ${RDEPEND} +DEPEND="${COMMON_DEPEND} valgrind? ( dev-debug/valgrind ) " -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:3[client] ) + server? ( !net-misc/freerdp:3[server] ) + tools? ( !net-misc/freerdp:3[tools] ) " +PATCHES=( + "${FILESDIR}/freerdp-2.11.2-clang.patch" + "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" +) + src_configure() { # bug #881695 filter-lto @@ -104,6 +115,7 @@ src_configure() { -DWITH_ALSA=$(usex alsa ON OFF) -DWITH_CCACHE=OFF -DWITH_CUPS=$(usex cups ON OFF) + -DWITH_CLIENT=$(usex client ON OFF) -DWITH_DEBUG_ALL=$(usex debug ON OFF) -DWITH_MANPAGES=$(usex doc ON OFF) -DWITH_FFMPEG=$(usex ffmpeg ON OFF) @@ -126,6 +138,7 @@ src_configure() { -DWITH_XINERAMA=$(usex xinerama ON OFF) -DWITH_XV=$(usex xv ON OFF) -DWITH_WAYLAND=$(usex wayland ON OFF) + -DWITH_WINPR_TOOLS=$(usex tools ON OFF) ) cmake_src_configure } diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index 6e2277b4bffe..9cabbcb2d8b9 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -22,11 +22,19 @@ DESCRIPTION="Free implementation of the Remote Desktop Protocol" HOMEPAGE="https://www.freerdp.com/"; LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" +SLOT="2" +IUSE="alsa cpu_flags_arm_neon client cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test tools usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -RDEPEND=" +BDEPEND=" + virtual/pkgconfig + X? ( doc? ( + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + ) ) +" + +COMMON_DEPEND=" dev-libs/openssl:0= sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) @@ -81,16 +89,14 @@ RDEPEND=" x11-libs/libxkbfile ) " -DEPEND=" - ${RDEPEND} +DEPEND="${COMMON_DEPEND} valgrind? ( dev-debug/valgrind ) " -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:3[client] ) + server? ( !net-misc/freerdp:3[server] ) + tools? ( !net-misc/freerdp:3[tools] ) " src_configure() { @@ -104,6 +110,7 @@ src_configure() { -DWITH_ALSA=$(usex alsa ON OFF) -DWITH_CCACHE=OFF -DWITH_CUPS=$(usex cups ON OFF) + -DWITH_CLIENT=$(usex client ON OFF) -DWITH_DEBUG_ALL=$(usex debug ON OFF) -DWITH_MANPAGES=$(usex doc ON OFF) -DWITH_FFMPEG=$(usex ffmpeg ON OFF) @@ -126,6 +133,7 @@ src_configure() { -DWITH_XINERAMA=$(usex xinerama ON OFF) -DWITH_XV=$(usex xv ON OFF) -DWITH_WAYLAND=$(usex wayland ON OFF) + -DWITH_WINPR_TOOLS=$(usex tools ON OFF) ) cmake_src_configure } diff --git a/net-misc/freerdp/freerdp-3.4.0-r2.ebuild b/net-misc/freerdp/freerdp-3.4.0-r10.ebuild similarity index 87% rename from net-misc/freerdp/freerdp-3.4.0-r2.ebuild rename to net-misc/freerdp/freerdp-3.4.0-r10.ebuild index 82b1a427b285..81778320b41c 100644 --- a/net-misc/freerdp/freerdp-3.4.0-r2.ebuild +++ b/net-misc/freerdp/freerdp-3.4.0-r10.ebuild @@ -22,11 +22,16 @@ DESCRIPTION="Free implementation of the Remote Desktop Protocol" HOMEPAGE="https://www.freerdp.com/"; LICENSE="Apache-2.0" -SLOT="0/3" -IUSE="aad alsa cpu_flags_arm_neon cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" +SLOT="3" +IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test +tools usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -RDEPEND=" +BDEPEND=" + virtual/pkgconfig + app-text/docbook-xsl-stylesheets + dev-libs/libxslt +" +COMMON_DEPEND=" dev-libs/openssl:0= sys-libs/zlib:0 aad? ( dev-libs/cJSON ) @@ -90,14 +95,14 @@ RDEPEND=" x11-libs/libxkbfile ) " -DEPEND=" - ${RDEPEND} +DEPEND="${COMMON_DEPEND} valgrind? ( dev-debug/valgrind ) " -BDEPEND=" - virtual/pkgconfig - app-text/docbook-xsl-stylesheets - dev-libs/libxslt +RDPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:2[client] ) + server? ( !net-misc/freerdp:2[server] ) + tools? ( !net-misc/freerdp:2[tools] ) " src_configure() { @@ -115,6 +120,7 @@ src_configure() { -DWITH_AAD=$(usex aad ON OFF) -DWITH_ALSA=$(usex alsa ON OFF) -DWITH_CCACHE=OFF + -DWITH_CLIENT=$(usex client ON OFF) -DWITH_CLIENT_SDL=$(usex sdl ON OFF) -DWITH_SAMPLE=OFF -DWITH_CUPS=$(usex cups ON OFF) @@ -144,6 +150,7 @@ src_configure() { -DWITH_XV=$(usex xv ON OFF) -DWITH_WAYLAND=$(usex wayland ON OFF) -DWITH_WEBVIEW=OFF + -DWITH_WINPR_TOOLS=$(usex tools ON OFF) ) cmake_src_configure } diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 82b1a427b285..81778320b41c 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -22,11 +22,16 @@ DESCRIPTION="Free implementation of the Remote Desktop Protocol" HOMEPAGE="https://www.freerdp.com/"; LICENSE="Apache-2.0" -SLOT="0/3" -IUSE="aad alsa cpu_flags_arm_neon cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" +SLOT="3" +IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test +tools usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -RDEPEND=" +BDEPEND=" + virtual/pkgconfig + app-text/docbook-xsl-stylesheets + dev-libs/libxslt +" +COMMON_DEPEND=" dev-libs/openssl:0= sys-libs/zlib:0 aad? ( dev-libs/cJSON ) @@ -90,14 +95,14 @@ RDEPEND=" x11-libs/libxkbfile ) " -DEPEND=" - ${RDEPEND} +DEPEND="${COMMON_DEPEND} valgrind? ( dev-debug/valgrind ) " -BDEPEND=" - virtual/pkgconfig - app-text/docbook-xsl-stylesheets - dev-libs/libxslt +RDPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:2[client] ) + server? ( !net-misc/freerdp:2[server] ) + tools? ( !net-misc/freerdp:2[tools] ) " src_configure() { @@ -115,6 +120,7 @@ src_configure() { -DWITH_AAD=$(usex aad ON OFF) -DWITH_ALSA=$(usex alsa ON OFF) -DWITH_CCACHE=OFF + -DWITH_CLIENT=$(usex client ON OFF) -DWITH_CLIENT_SDL=$(usex sdl ON OFF) -DWITH_SAMPLE=OFF -DWITH_CUPS=$(usex cups ON OFF) @@ -144,6 +150,7 @@ src_configure() { -DWITH_XV=$(usex xv ON OFF) -DWITH_WAYLAND=$(usex wayland ON OFF) -DWITH_WEBVIEW=OFF + -DWITH_WINPR_TOOLS=$(usex tools ON OFF) ) cmake_src_configure } diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml index 0fc989abd6dc..f779a3f3fb62 100644 --- a/net-misc/freerdp/metadata.xml +++ b/net-misc/freerdp/metadata.xml @@ -7,9 +7,11 @@ </maintainer> <use> <flag name="aad">Enable login via Azure AD</flag> + <flag name="client">Build client binaries</flag> <flag name="fuse">Clipboard with FUSE file copy support</flag> <flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag> <flag name="server">Build server binaries</flag> + <flag name="tools">Build tools</flag> </use> <upstream> <remote-id type="github">FreeRDP/FreeRDP</remote-id>
