From 5c94a4b3d11ad7b169e23bd604cf403c96bf4f1c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Mar 2024 18:49:32 +0000 Subject: gentoo auto-resync : 17:03:2024 - 18:49:32 --- net-misc/freerdp/Manifest | 9 +- net-misc/freerdp/freerdp-2.11.5-r10.ebuild | 169 +++++++++++++++++++++++++++ net-misc/freerdp/freerdp-2.9999.ebuild | 105 ++++++++++------- net-misc/freerdp/freerdp-3.4.0-r10.ebuild | 182 +++++++++++++++++++++++++++++ net-misc/freerdp/freerdp-3.4.0-r2.ebuild | 156 ------------------------- net-misc/freerdp/freerdp-9999.ebuild | 106 ++++++++++------- net-misc/freerdp/metadata.xml | 2 + 7 files changed, 490 insertions(+), 239 deletions(-) create mode 100644 net-misc/freerdp/freerdp-2.11.5-r10.ebuild create mode 100644 net-misc/freerdp/freerdp-3.4.0-r10.ebuild delete mode 100644 net-misc/freerdp/freerdp-3.4.0-r2.ebuild (limited to 'net-misc/freerdp') diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 87254b88c693..cbe784d9723e 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -4,8 +4,9 @@ DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2 DIST freerdp-3.2.0.tar.gz 8407869 BLAKE2B cebb14965a71a441d1e53b778db1464751830e96660b6f0d68f32c741544a173b57c4fc92ec24ea6aa3599b62db666987e66b46bd4e6fd2de7ce72869a5d1a07 SHA512 ace6004d11f7fea0e1f927a84367afd9e51b2b566135d7055f548146922a949b9324a2e172bfc1c055bcd27f0eea3e077dc6cfd825c172bffdecb8c28edb076e DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1 SHA512 b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5 EBUILD freerdp-2.11.5-r1.ebuild 3390 BLAKE2B 0d737f70a9631c8fbc984578d351d501763aed71acd3543153088ad464dd6fa704bc346e5b51d7197b165adc6d6538446f5ddfa0b54a5cf68e1d40c6fe849744 SHA512 b7a34473f106d3bc438b4315e66e5e2e572ac4e7b3114facb657f103d114eb49cd0bd8661440b06e21bed58ae693c1dfcd84525af342fb9af25570a37156bd07 -EBUILD freerdp-2.9999.ebuild 3255 BLAKE2B fa65f3ed311801dfa1ac4493a81a1a3551724e68722cdb825c9c159ff06d158c20c722184108ceaf87ded460f60d41e5ab849ac77b8b9155ff14f3c7943f831c SHA512 8058dbdcd89d40e84883b82aef17d7096bb93faf1e35f0198063a2807106d4814b0332fed7f626c43aade813391c557787f0a65c6dbc75d0ff04f2b27ff1ccdf +EBUILD freerdp-2.11.5-r10.ebuild 3748 BLAKE2B f30b3527c0ffca64e0f0fb9e640060e94d8f14ce409735e569260ba6623bd57c6f80558d32490db02fc73ff507c1e9b539901a31ee545f81636a0300dfd3ba4d SHA512 92b52a4666cfc73707597f38e26f51cf438a27e4675f95fc66e8493034b2c821f3c68c32907bd3ad7ce256a5c05d052dd2d6ab833a6800ec24e031d0bb0f4c65 +EBUILD freerdp-2.9999.ebuild 3614 BLAKE2B f74e23e24b5064aee5d07076efd84daa8abeb29c41e2110ebb23be7dae2230873a6cc568a137a5031b37f4617a4d49433f829873048e7fcef233d5dfb13e487c SHA512 e0dfd92e1d72ac831bb421676aa7e868c5d9ef833a41b304d74189dba191a7932131a515f842056b7f7e8133deb67caa6774640f26fc42423c7289323c63093c EBUILD freerdp-3.2.0-r2.ebuild 3795 BLAKE2B 8653776ac56bc09b9e19ca8c70cad31ffa554ff3cae6f48d1d2d3afa14f76ba7bd2b21508caa68a2d1aac8605fab80e89ad95d25d89ebc12ba42b7997e9bd6bf SHA512 3738ec8393ea0cd2ce324040691ffe7c9e4a2d75833c4181eeab5ce965cdb8e5f7ea2ace4474caec1d695a1ad48fc5e9d6f6145a0499844753fdb1b07bb56b7d -EBUILD freerdp-3.4.0-r2.ebuild 3795 BLAKE2B 8653776ac56bc09b9e19ca8c70cad31ffa554ff3cae6f48d1d2d3afa14f76ba7bd2b21508caa68a2d1aac8605fab80e89ad95d25d89ebc12ba42b7997e9bd6bf SHA512 3738ec8393ea0cd2ce324040691ffe7c9e4a2d75833c4181eeab5ce965cdb8e5f7ea2ace4474caec1d695a1ad48fc5e9d6f6145a0499844753fdb1b07bb56b7d -EBUILD freerdp-9999.ebuild 3795 BLAKE2B 8653776ac56bc09b9e19ca8c70cad31ffa554ff3cae6f48d1d2d3afa14f76ba7bd2b21508caa68a2d1aac8605fab80e89ad95d25d89ebc12ba42b7997e9bd6bf SHA512 3738ec8393ea0cd2ce324040691ffe7c9e4a2d75833c4181eeab5ce965cdb8e5f7ea2ace4474caec1d695a1ad48fc5e9d6f6145a0499844753fdb1b07bb56b7d -MISC metadata.xml 599 BLAKE2B abc5045f654a1dee76a0c4352bb2374063a885c1bce2b0ccf43a62cf933119a6aa50bf835c3b35e546d6bbd772100d8523e4f388ebbb43883e5903957799d65e SHA512 7f06ed1615b32380a21e5fe772e0e36c475dc105a78f8766c13158b49526b288d4de81be2649861544acd8cd3ac51720c985ebfe19cb4439f3ea96c67b729c01 +EBUILD freerdp-3.4.0-r10.ebuild 4140 BLAKE2B 62700fe4787e624abea39554c079e3ec3f2e676f356657e1c4ed190b10210ce252263491a1f542ca14448b8d3e39f298cc06946452d3a055eb7007c938adf415 SHA512 f7ced9a02b76f9ed97a5b50ec75d2c1a9ed8aee0c07bc647fadbbb2e76931641073f80bf6e84db7231c327064b0b4110a8c3e337301fa0e62153d8f110bfe2f0 +EBUILD freerdp-9999.ebuild 4140 BLAKE2B 62700fe4787e624abea39554c079e3ec3f2e676f356657e1c4ed190b10210ce252263491a1f542ca14448b8d3e39f298cc06946452d3a055eb7007c938adf415 SHA512 f7ced9a02b76f9ed97a5b50ec75d2c1a9ed8aee0c07bc647fadbbb2e76931641073f80bf6e84db7231c327064b0b4110a8c3e337301fa0e62153d8f110bfe2f0 +MISC metadata.xml 690 BLAKE2B 17e06b8b29577f55cdb2ca30d820ac6cac7e8fcf5567e7f16aea5c0bb26ed7086c69b821e9a0d603c1f8a1f1854cc255ef61ecd5bb2e3152ec9fccc502cabfcb SHA512 28a5eefee2f8b2702db9b9684992d9e02eebe378520ac9d87f1db60f92033e3d670171ef0da66a9afe8fafa7d603c453a20baaae905e549e5ed493246374a87a diff --git a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild new file mode 100644 index 000000000000..e3c30486ef78 --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild @@ -0,0 +1,169 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + esac +else + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +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 )" + +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 ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + x11-libs/libXrandr + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( sys-apps/pcsc-lite ) + systemd? ( sys-apps/systemd:0= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +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" +) + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_CLIENT=$(option client) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=$(option doc) + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_ICU=$(option icu) + -DWITH_JPEG=$(option jpeg) + -DWITH_GSSAPI=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_PCSC=$(option smartcard) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WINPR_TOOLS=$(option tools) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=() + use elibc_musl && myctestargs+=( -E TestBacktrace ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die +} diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index 6e2277b4bffe..035df26f5b1e 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 ) @@ -72,60 +80,74 @@ RDEPEND=" ) 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 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] ) " +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + src_configure() { # bug #881695 filter-lto local mycmakeargs=( -Wno-dev - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_ALSA=$(option alsa) -DWITH_CCACHE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=$(usex doc ON OFF) - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_ICU=$(usex icu ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_GSSAPI=$(usex kerberos ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) + -DWITH_CUPS=$(option cups) + -DWITH_CLIENT=$(option client) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=$(option doc) + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_ICU=$(option icu) + -DWITH_JPEG=$(option jpeg) + -DWITH_GSSAPI=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) -DWITH_OSS=OFF - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_PCSC=$(option smartcard) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WINPR_TOOLS=$(option tools) ) cmake_src_configure } @@ -135,3 +157,8 @@ src_test() { use elibc_musl && myctestargs+=( -E TestBacktrace ) cmake_src_test } + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die +} diff --git a/net-misc/freerdp/freerdp-3.4.0-r10.ebuild b/net-misc/freerdp/freerdp-3.4.0-r10.ebuild new file mode 100644 index 000000000000..1821299544d6 --- /dev/null +++ b/net-misc/freerdp/freerdp-3.4.0-r10.ebuild @@ -0,0 +1,182 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + esac +else + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +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 )" + +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 ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + fuse? ( sys-fs/fuse:3 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + X? ( x11-libs/libXrandr ) + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + sdl? ( + media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)] + media-libs/sdl2-ttf + ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( + dev-libs/pkcs11-helper + sys-apps/pcsc-lite + ) + systemd? ( sys-apps/systemd:0= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +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] ) +" + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + + # https://bugs.gentoo.org/927037 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF + + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_AAD=$(option aad) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CLIENT=$(option client) + -DWITH_CLIENT_SDL=$(option sdl) + -DWITH_SAMPLE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_FUSE=$(option fuse) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_JPEG=$(option jpeg) + -DWITH_KRB5=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PCSC=$(option smartcard) + -DWITH_PKCS11=$(option smartcard) + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_UNICODE_BUILTIN=$(option !icu) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WEBVIEW=OFF + -DWITH_WINPR_TOOLS=$(option tools) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=() + use elibc_musl && myctestargs+=( -E TestBacktrace ) + has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die +} diff --git a/net-misc/freerdp/freerdp-3.4.0-r2.ebuild b/net-misc/freerdp/freerdp-3.4.0-r2.ebuild deleted file mode 100644 index 82b1a427b285..000000000000 --- a/net-misc/freerdp/freerdp-3.4.0-r2.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 2011-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" - case ${PV} in - 2.*) EGIT_BRANCH="stable-2.0";; - esac -else - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -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" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib:0 - aad? ( dev-libs/cJSON ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - fuse? ( sys-fs/fuse:3 ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - X? ( x11-libs/libXrandr ) - ) - icu? ( dev-libs/icu:0= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - kerberos? ( virtual/krb5 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-libs/libpulse ) - sdl? ( - media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)] - media-libs/sdl2-ttf - ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( - dev-libs/pkcs11-helper - sys-apps/pcsc-lite - ) - systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND=" - ${RDEPEND} - valgrind? ( dev-debug/valgrind ) -" -BDEPEND=" - virtual/pkgconfig - app-text/docbook-xsl-stylesheets - dev-libs/libxslt -" - -src_configure() { - # bug #881695 - filter-lto - - local mycmakeargs=( - -Wno-dev - - # https://bugs.gentoo.org/927037 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF - - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_AAD=$(usex aad ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) - -DWITH_CCACHE=OFF - -DWITH_CLIENT_SDL=$(usex sdl ON OFF) - -DWITH_SAMPLE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=ON - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_FUSE=$(usex fuse ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_KRB5=$(usex kerberos ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_OSS=OFF - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_PKCS11=$(usex smartcard ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_UNICODE_BUILTIN=$(usex icu OFF ON) - -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) - -DWITH_WEBVIEW=OFF - ) - cmake_src_configure -} - -src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) - has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) - cmake_src_test -} diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 82b1a427b285..1821299544d6 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 ) @@ -81,25 +86,39 @@ RDEPEND=" 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 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] ) " +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + src_configure() { # bug #881695 filter-lto @@ -110,40 +129,42 @@ src_configure() { # https://bugs.gentoo.org/927037 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_AAD=$(usex aad ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_AAD=$(option aad) + -DWITH_ALSA=$(option alsa) -DWITH_CCACHE=OFF - -DWITH_CLIENT_SDL=$(usex sdl ON OFF) + -DWITH_CLIENT=$(option client) + -DWITH_CLIENT_SDL=$(option sdl) -DWITH_SAMPLE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) + -DWITH_CUPS=$(option cups) + -DWITH_DEBUG_ALL=$(option debug) -DWITH_MANPAGES=ON - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) + -DWITH_FFMPEG=$(option ffmpeg) -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_FUSE=$(usex fuse ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_KRB5=$(usex kerberos ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_FUSE=$(option fuse) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_JPEG=$(option jpeg) + -DWITH_KRB5=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) -DWITH_OSS=OFF - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_PKCS11=$(usex smartcard ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_UNICODE_BUILTIN=$(usex icu OFF ON) - -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) + -DWITH_PCSC=$(option smartcard) + -DWITH_PKCS11=$(option smartcard) + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_UNICODE_BUILTIN=$(option !icu) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) -DWITH_WEBVIEW=OFF + -DWITH_WINPR_TOOLS=$(option tools) ) cmake_src_configure } @@ -154,3 +175,8 @@ src_test() { has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) cmake_src_test } + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die +} 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 @@ Enable login via Azure AD + Build client binaries Clipboard with FUSE file copy support Enable H.264 support using media-libs/openh264 Build server binaries + Build tools FreeRDP/FreeRDP -- cgit v1.2.3