commit: 6736259c3cb5f0675aa42c3858415e3be0434cc5 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Feb 27 01:55:02 2026 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Feb 27 17:56:59 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6736259c
net-misc/freerdp: drop 2.11.7-r1, 2.9999 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> Part-of: https://codeberg.org/gentoo/gentoo/pulls/158 Merges: https://codeberg.org/gentoo/gentoo/pulls/158 net-misc/freerdp/Manifest | 2 - ...ec-encode-messages-considering-endianness.patch | 329 --------------------- net-misc/freerdp/files/freerdp-2.11.2-clang.patch | 29 -- .../files/freerdp-2.11.7-type-mismatch.patch | 23 -- net-misc/freerdp/freerdp-2.11.7-r1.ebuild | 182 ------------ net-misc/freerdp/freerdp-2.9999.ebuild | 175 ----------- 6 files changed, 740 deletions(-) diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 9f84a26dae03..838d4f7e87e9 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,5 +1,3 @@ -DIST freerdp-2.11.7.tar.gz 7337520 BLAKE2B ad579b4c36d96a17ccceb26c4c34124a050c05c49c05e2d8b4fd46789929dd4581d26aad88de7a3b3e6ecdd330b9b2ac2d45616537c1c635d10706f14a36f5ca SHA512 e1b4ac112090f2364ef2c360453f91b4643680cad75785cb214b48ebbc78c5eeca9fa8fe9f84f241a70825eefb5273e4e380483a5cdc86c92aa6ac1eb22c188e -DIST freerdp-2.11.7.tar.gz.asc 228 BLAKE2B a374c22ada6da59fb66fcb8021d5bb27545df0c0875b929766dc9b468e9fbfb4a79b1c38b2dbf5c44f925fd44305b1798e5ede0e6726a85c98cac96ceb8020f2 SHA512 18a1b8f18bba14e0156e5eca8fad28efdadd2f87fa29221629ffd9cf53f74606392de0df0e11ae41809fad0509c87462ee29d1e01e9df0dfe08b29832378be76 DIST freerdp-3.14.1.tar.gz 10439467 BLAKE2B 6ee961901ccce21ef77eec70c81cf65d3fc1c0c0c06737ab95056f35a9fed025892ff36521bb86f097ae0aeef365f727c7442f04818782b81a0c0db250438e74 SHA512 56f267cb10f9d6b4b6768886324f4498e2f41d974a450d842262a411cee6fccb80ae95f17464f18ac886157425b4fed9931bfe4eabd86f31cd10baf02fc023e9 DIST freerdp-3.14.1.tar.gz.asc 228 BLAKE2B d0adb7c8b3cb7aef3e7d414c3036a35a36090e10cbb15e36332b71ffd088e31a091e903873f1b2a77c8fa3292bb5954b20c95f79dfe0a7fd21ff0679df5d827c SHA512 d790dedc227252b1ee8f13b27067a37cbd9f8db9823875a9156149331eafe45b88125ae6b910984a55c69b0f143ff3f3df983c701fa4a32e6cd816d289fa1a9b DIST freerdp-3.16.0.tar.gz 10455341 BLAKE2B e26e6465eda2831308d328be2398abebd8a812e47ce108d694bdd9948e936a4d151a53952127f7daa5dc5414239cd28fac724217061aebfddd7ce31a773dfd62 SHA512 6053c48f499f9252409d12f21f237ea8787419f2314bf1521da2a7c0db7721ab571a1a18c4c5e956891e3c1df56b2e340805375436d0f00a510535b4d8dbc92b diff --git a/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch b/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch deleted file mode 100644 index 8d45331bd95b..000000000000 --- a/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch +++ /dev/null @@ -1,329 +0,0 @@ -https://github.com/FreeRDP/FreeRDP/issues/9616 - -From 8b349f4f2b5d14e28a6a73e9c2b9860d7f275bc4 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Thu, 7 Dec 2023 15:54:38 -0500 -Subject: [PATCH] Revert "[codec] encode messages considering endianness" - -This reverts commit e3ef8a02ddf079bcf6dfa58888db69a709ce50c9. ---- - libfreerdp/codec/nsc_encode.c | 76 +++++++++++++---------------------- - libfreerdp/codec/rfx_encode.c | 74 +++++++++++++--------------------- - 2 files changed, 58 insertions(+), 92 deletions(-) - -diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c -index 477318cc1..fd9626a6d 100644 ---- a/libfreerdp/codec/nsc_encode.c -+++ b/libfreerdp/codec/nsc_encode.c -@@ -119,8 +119,6 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI - UINT16 rw; - BYTE ccl; - const BYTE* src; -- const UINT32* src_32; -- const UINT16* src_16; - BYTE* yplane = NULL; - BYTE* coplane = NULL; - BYTE* cgplane = NULL; -@@ -142,85 +140,69 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI - coplane = context->priv->PlaneBuffers[1] + y * rw; - cgplane = context->priv->PlaneBuffers[2] + y * rw; - aplane = context->priv->PlaneBuffers[3] + y * context->width; -- src_32 = (UINT32*)src; -- src_16 = (UINT16*)src; - - for (x = 0; x < context->width; x++) - { - switch (context->format) - { - case PIXEL_FORMAT_BGRX32: -- b_val = (INT16)(*src_32 & 0xFF); -- g_val = (INT16)((*src_32 >> 8) & 0xFF); -- r_val = (INT16)((*src_32 >> 16) & 0xFF); -+ b_val = *src++; -+ g_val = *src++; -+ r_val = *src++; -+ src++; - a_val = 0xFF; -- src_32++; - break; - - case PIXEL_FORMAT_BGRA32: -- b_val = (INT16)(*src_32 & 0xFF); -- g_val = (INT16)((*src_32 >> 8) & 0xFF); -- r_val = (INT16)((*src_32 >> 16) & 0xFF); -- a_val = (INT16)((*src_32 >> 24) & 0xFF); -- src_32++; -+ b_val = *src++; -+ g_val = *src++; -+ r_val = *src++; -+ a_val = *src++; - break; - - case PIXEL_FORMAT_RGBX32: -- r_val = (INT16)(*src_32 & 0xFF); -- g_val = (INT16)((*src_32 >> 8) & 0xFF); -- b_val = (INT16)((*src_32 >> 16) & 0xFF); -+ r_val = *src++; -+ g_val = *src++; -+ b_val = *src++; -+ src++; - a_val = 0xFF; -- src_32++; - break; - - case PIXEL_FORMAT_RGBA32: -- r_val = (INT16)(*src_32 & 0xFF); -- g_val = (INT16)((*src_32 >> 8) & 0xFF); -- b_val = (INT16)((*src_32 >> 16) & 0xFF); -- a_val = (INT16)((*src_32 >> 24) & 0xFF); -- src_32++; -+ r_val = *src++; -+ g_val = *src++; -+ b_val = *src++; -+ a_val = *src++; - break; - - case PIXEL_FORMAT_BGR24: --#ifdef __LITTLE_ENDIAN__ - b_val = *src++; - g_val = *src++; - r_val = *src++; --#else -- r_val = *src++; -- g_val = *src++; -- b_val = *src++; --#endif - a_val = 0xFF; - break; - - case PIXEL_FORMAT_RGB24: --#ifdef __LITTLE_ENDIAN__ - r_val = *src++; - g_val = *src++; - b_val = *src++; --#else -- b_val = *src++; -- g_val = *src++; -- r_val = *src++; --#endif - a_val = 0xFF; - break; - - case PIXEL_FORMAT_BGR16: -- b_val = (INT16)((*src_16) & 0x1F); -- g_val = (INT16)((*src_16 >> 5) & 0x3F); -- r_val = (INT16)((*src_16 >> 11) & 0x1F); -+ b_val = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); -+ g_val = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); -+ r_val = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); - a_val = 0xFF; -- src_16++; -+ src += 2; - break; - - case PIXEL_FORMAT_RGB16: -- r_val = (INT16)((*src_16) & 0x1F); -- g_val = (INT16)((*src_16 >> 5) & 0x3F); -- b_val = (INT16)((*src_16 >> 11) & 0x1F); -+ r_val = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); -+ g_val = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); -+ b_val = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); - a_val = 0xFF; -- src_16++; -+ src += 2; - break; - - case PIXEL_FORMAT_A4: -@@ -228,17 +210,17 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI - int shift; - BYTE idx; - shift = (7 - (x % 8)); -- idx = (BYTE)(((*src_32 & 0xFF) >> shift) & 1); -- idx |= (BYTE)(((((*src_32 >> 8) & 0xFF) >> shift) & 1) << 1); -- idx |= (BYTE)(((((*src_32 >> 16) & 0xFF) >> shift) & 1) << 2); -- idx |= (BYTE)(((((*src_32 >> 24) & 0xFF) >> shift) & 1) << 3); -+ idx = ((*src) >> shift) & 1; -+ idx |= (((*(src + 1)) >> shift) & 1) << 1; -+ idx |= (((*(src + 2)) >> shift) & 1) << 2; -+ idx |= (((*(src + 3)) >> shift) & 1) << 3; - idx *= 3; - r_val = (INT16)context->palette[idx]; - g_val = (INT16)context->palette[idx + 1]; - b_val = (INT16)context->palette[idx + 2]; - - if (shift == 0) -- src_32++; -+ src += 4; - } - - a_val = 0xFF; -diff --git a/libfreerdp/codec/rfx_encode.c b/libfreerdp/codec/rfx_encode.c -index 355f74340..b4f393605 100644 ---- a/libfreerdp/codec/rfx_encode.c -+++ b/libfreerdp/codec/rfx_encode.c -@@ -49,8 +49,6 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i - int x_exceed; - int y_exceed; - const BYTE* src; -- const UINT32* src_32; -- const UINT16* src_16; - INT16 r, g, b; - INT16 *r_last, *g_last, *b_last; - x_exceed = 64 - width; -@@ -59,8 +57,6 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i - for (y = 0; y < height; y++) - { - src = rgb_data + y * rowstride; -- src_32 = (UINT32*)src; -- src_16 = (UINT16*)src; - - switch (pixel_format) - { -@@ -68,10 +64,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i - case PIXEL_FORMAT_BGRA32: - for (x = 0; x < width; x++) - { -- *b_buf++ = (INT16)(*src_32 & 0xFF); -- *g_buf++ = (INT16)((*src_32 >> 8) & 0xFF); -- *r_buf++ = (INT16)((*src_32 >> 16) & 0xFF); -- src_32++; -+ *b_buf++ = (INT16)(*src++); -+ *g_buf++ = (INT16)(*src++); -+ *r_buf++ = (INT16)(*src++); -+ src++; - } - - break; -@@ -80,10 +76,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i - case PIXEL_FORMAT_ABGR32: - for (x = 0; x < width; x++) - { -- *b_buf++ = (INT16)((*src_32 >> 8) & 0xFF); -- *g_buf++ = (INT16)((*src_32 >> 16) & 0xFF); -- *r_buf++ = (INT16)((*src_32 >> 24) & 0xFF); -- src_32++; -+ src++; -+ *b_buf++ = (INT16)(*src++); -+ *g_buf++ = (INT16)(*src++); -+ *r_buf++ = (INT16)(*src++); - } - - break; -@@ -92,10 +88,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i - case PIXEL_FORMAT_RGBA32: - for (x = 0; x < width; x++) - { -- *r_buf++ = (INT16)(*src_32 & 0xFF); -- *g_buf++ = (INT16)((*src_32 >> 8) & 0xFF); -- *b_buf++ = (INT16)((*src_32 >> 16) & 0xFF); -- src_32++; -+ *r_buf++ = (INT16)(*src++); -+ *g_buf++ = (INT16)(*src++); -+ *b_buf++ = (INT16)(*src++); -+ src++; - } - - break; -@@ -104,10 +100,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i - case PIXEL_FORMAT_ARGB32: - for (x = 0; x < width; x++) - { -- *r_buf++ = (INT16)((*src_32 >> 8) & 0xFF); -- *g_buf++ = (INT16)((*src_32 >> 16) & 0xFF); -- *b_buf++ = (INT16)((*src_32 >> 24) & 0xFF); -- src_32++; -+ src++; -+ *r_buf++ = (INT16)(*src++); -+ *g_buf++ = (INT16)(*src++); -+ *b_buf++ = (INT16)(*src++); - } - - break; -@@ -115,15 +111,9 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i - case PIXEL_FORMAT_BGR24: - for (x = 0; x < width; x++) - { --#ifdef __LITTLE_ENDIAN__ - *b_buf++ = (INT16)(*src++); - *g_buf++ = (INT16)(*src++); - *r_buf++ = (INT16)(*src++); --#else -- *r_buf++ = (INT16)(*src++); -- *g_buf++ = (INT16)(*src++); -- *b_buf++ = (INT16)(*src++); --#endif - } - - break; -@@ -131,15 +121,9 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i - case PIXEL_FORMAT_RGB24: - for (x = 0; x < width; x++) - { --#ifdef __LITTLE_ENDIAN__ - *r_buf++ = (INT16)(*src++); - *g_buf++ = (INT16)(*src++); - *b_buf++ = (INT16)(*src++); --#else -- *b_buf++ = (INT16)(*src++); -- *g_buf++ = (INT16)(*src++); -- *r_buf++ = (INT16)(*src++); --#endif - } - - break; -@@ -147,10 +131,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i - case PIXEL_FORMAT_BGR16: - for (x = 0; x < width; x++) - { -- *b_buf++ = (INT16)((*src_16) & 0x1F); -- *g_buf++ = (INT16)((*src_16 >> 5) & 0x3F); -- *r_buf++ = (INT16)((*src_16 >> 11) & 0x1F); -- src_16++; -+ *b_buf++ = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); -+ *g_buf++ = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); -+ *r_buf++ = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); -+ src += 2; - } - - break; -@@ -158,10 +142,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i - case PIXEL_FORMAT_RGB16: - for (x = 0; x < width; x++) - { -- *r_buf++ = (INT16)((*src_16 & 0x1F)); -- *g_buf++ = (INT16)((*src_16 >> 5) & 0x3F); -- *b_buf++ = (INT16)((*src_16 >> 11) & 0x1F); -- src_16++; -+ *r_buf++ = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); -+ *g_buf++ = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); -+ *b_buf++ = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); -+ src += 2; - } - - break; -@@ -175,17 +159,17 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i - int shift; - BYTE idx; - shift = (7 - (x % 8)); -- idx = (BYTE)(((*src_32 & 0xFF) >> shift) & 1); -- idx |= (BYTE)(((((*src_32 >> 8) & 0xFF) >> shift) & 1) << 1); -- idx |= (BYTE)(((((*src_32 >> 16) & 0xFF) >> shift) & 1) << 2); -- idx |= (BYTE)(((((*src_32 >> 24) & 0xFF) >> shift) & 1) << 3); -+ idx = ((*src) >> shift) & 1; -+ idx |= (((*(src + 1)) >> shift) & 1) << 1; -+ idx |= (((*(src + 2)) >> shift) & 1) << 2; -+ idx |= (((*(src + 3)) >> shift) & 1) << 3; - idx *= 3; - *r_buf++ = (INT16)palette[idx]; - *g_buf++ = (INT16)palette[idx + 1]; - *b_buf++ = (INT16)palette[idx + 2]; - - if (shift == 0) -- src_32++; -+ src += 4; - } - - break; --- -2.43.0 - diff --git a/net-misc/freerdp/files/freerdp-2.11.2-clang.patch b/net-misc/freerdp/files/freerdp-2.11.2-clang.patch deleted file mode 100644 index b05492a3effd..000000000000 --- a/net-misc/freerdp/files/freerdp-2.11.2-clang.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/FreeRDP/FreeRDP/pull/9373 -https://bugs.gentoo.org/916515 - -From 88dd68153c834e1d5f59beb59496bfd1bf9697a8 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <[email protected]> -Date: Mon, 11 Sep 2023 00:31:54 +0000 -Subject: [PATCH] Fixes clang error error: incompatible function pointer types - assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const - void *)' [-Wincompatible-function-pointer-types] | obj->fnObjectNew = - uwac_event_clone; | ^ ~~~~~~~~~~~~~~~~ - -Signed-off-by: Wang Mingyu <[email protected]> ---- - client/Wayland/wlfreerdp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c -index 5be10aae2c1b..ef3539383f55 100644 ---- a/client/Wayland/wlfreerdp.c -+++ b/client/Wayland/wlfreerdp.c -@@ -598,7 +598,7 @@ static void wlf_client_free(freerdp* instance, rdpContext* context) - DeleteCriticalSection(&wlf->critical); - } - --static void* uwac_event_clone(const void* val) -+static void* uwac_event_clone(void* val) - { - UwacEvent* copy; - const UwacEvent* ev = (const UwacEvent*)val; diff --git a/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch b/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch deleted file mode 100644 index 34720aef4b5b..000000000000 --- a/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d2b6771c748e54e659d5f1243a92e499c3beaa36 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Wed, 22 May 2024 17:04:43 -0400 -Subject: [PATCH] X11: fix pointer/integer type mismatch - -Fixed on master in 2da280b8a1748052b70b3f5a1ef0d8e932c33adc. ---- - client/X11/xf_graphics.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c -index 5aa1fd48b5a3..fe81e0ed91cb 100644 ---- a/client/X11/xf_graphics.c -+++ b/client/X11/xf_graphics.c -@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) - - #endif - fail: -- WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1); -+ WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL); - return rc; - } - diff --git a/net-misc/freerdp/freerdp-2.11.7-r1.ebuild b/net-misc/freerdp/freerdp-2.11.7-r1.ebuild deleted file mode 100644 index ac401540864a..000000000000 --- a/net-misc/freerdp/freerdp-2.11.7-r1.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 2011-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake ffmpeg-compat 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 - inherit verify-sig - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz - verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" - KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" - VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" -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 +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -BDEPEND+=" - virtual/pkgconfig - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto -" - -COMMON_DEPEND=" - dev-libs/openssl:0= - virtual/zlib:= - 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-compat:6= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - 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 ) - 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] ) -" - -src_prepare() { - local PATCHES=( - "${FILESDIR}/freerdp-2.11.2-clang.patch" - "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" - "${FILESDIR}/freerdp-2.11.7-type-mismatch.patch" - ) - cmake_src_prepare -} - -option() { - usex "$1" ON OFF -} - -option_client() { - if use client; then - option "$1" - else - echo OFF - fi -} - -src_configure() { - # TODO: fix with >=ffmpeg-7 (or mask USE) then drop compat (bug #926787) - if use ffmpeg; then - ffmpeg_compat_setup 6 - ffmpeg_compat_add_flags - fi - - # bug #881695 - filter-lto - - # https://bugs.gentoo.org/927731 - append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) - - 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=ON - -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 server) - ) - cmake_src_configure -} - -src_test() { - local 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 deleted file mode 100644 index d8d4f84d0f71..000000000000 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 2011-2025 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 - inherit verify-sig - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz - verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" - VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" -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 +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -BDEPEND+=" - virtual/pkgconfig - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto -" - -COMMON_DEPEND=" - dev-libs/openssl:0= - virtual/zlib:= - 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 - 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 ) - 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] ) -" - -src_prepare() { - local PATCHES=( - "${FILESDIR}/freerdp-2.11.2-clang.patch" - "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" - ) - cmake_src_prepare -} - -option() { - usex "$1" ON OFF -} - -option_client() { - if use client; then - option "$1" - else - echo OFF - fi -} - -src_configure() { - # bug #881695 - filter-lto - - # https://bugs.gentoo.org/927731 - append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) - - 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=ON - -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 server) - ) - cmake_src_configure -} - -src_test() { - local myctestargs=( -E TestBacktrace ) - cmake_src_test -} - -src_install() { - cmake_src_install - mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die -}
