commit: 9877dacd5fcb5d3c8501e364f3e93034182240de Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue May 13 18:42:26 2025 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue May 13 18:51:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9877dacd
net-misc/freerdp: wire up SDL3 support Closes: https://bugs.gentoo.org/954328 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-misc/freerdp/freerdp-3.15.0.ebuild | 19 +++++++++++-------- net-misc/freerdp/freerdp-9999.ebuild | 19 +++++++++++-------- net-misc/freerdp/metadata.xml | 1 + profiles/arch/amd64/package.use.mask | 4 ++++ profiles/arch/base/package.use.mask | 4 ++++ 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/net-misc/freerdp/freerdp-3.15.0.ebuild b/net-misc/freerdp/freerdp-3.15.0.ebuild index 02a4f530f160..9c0fd141b3df 100644 --- a/net-misc/freerdp/freerdp-3.15.0.ebuild +++ b/net-misc/freerdp/freerdp-3.15.0.ebuild @@ -27,7 +27,7 @@ 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 usb valgrind wayland X xinerama xv" +IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl sdl3 server smartcard systemd test usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" BDEPEND+=" @@ -70,10 +70,6 @@ COMMON_DEPEND=" 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 @@ -88,6 +84,14 @@ COMMON_DEPEND=" smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) client? ( + sdl? ( + media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)] + media-libs/sdl2-ttf + ) + sdl3? ( + media-libs/libsdl3 + media-libs/sdl3-ttf + ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon @@ -146,9 +150,8 @@ freerdp_configure() { -DWITH_CCACHE=OFF -DWITH_CLIENT=$(option client) - -DWITH_CLIENT_SDL=$(option sdl) - # https://bugs.gentoo.org/951452 - -DWITH_CLIENT_SDL3=OFF + -DWITH_CLIENT_SDL2=$(option_client sdl) + -DWITH_CLIENT_SDL3=$(option_client sdl3) -DWITH_SAMPLE=OFF -DWITH_CUPS=$(option cups) diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 02a4f530f160..9c0fd141b3df 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -27,7 +27,7 @@ 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 usb valgrind wayland X xinerama xv" +IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl sdl3 server smartcard systemd test usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" BDEPEND+=" @@ -70,10 +70,6 @@ COMMON_DEPEND=" 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 @@ -88,6 +84,14 @@ COMMON_DEPEND=" smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) client? ( + sdl? ( + media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)] + media-libs/sdl2-ttf + ) + sdl3? ( + media-libs/libsdl3 + media-libs/sdl3-ttf + ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon @@ -146,9 +150,8 @@ freerdp_configure() { -DWITH_CCACHE=OFF -DWITH_CLIENT=$(option client) - -DWITH_CLIENT_SDL=$(option sdl) - # https://bugs.gentoo.org/951452 - -DWITH_CLIENT_SDL3=OFF + -DWITH_CLIENT_SDL2=$(option_client sdl) + -DWITH_CLIENT_SDL3=$(option_client sdl3) -DWITH_SAMPLE=OFF -DWITH_CUPS=$(option cups) diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml index ff51b9ab1df0..817c48961f27 100644 --- a/net-misc/freerdp/metadata.xml +++ b/net-misc/freerdp/metadata.xml @@ -10,6 +10,7 @@ <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="sdl3">Build SDL3 client</flag> <flag name="server">Build server binaries</flag> </use> <upstream> diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index c2fd7da55bf0..bbb8ebfb6764 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Mike Gilbert <[email protected]> (2025-05-13) +# media-libs/libsdl3 is keyworded here. +net-misc/freerdp -sdl3 + # Michał Górny <[email protected]> (2025-05-08) # dev-python/sigstore is keyworded here. >=dev-lang/python-3.14 -verify-sig diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 13d686d67e07..04e3055e33b8 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Mike Gilbert <[email protected]> (2025-05-13) +# media-libs/libsdl3 is missing keywords. +net-misc/freerdp sdl3 + # Michał Górny <[email protected]> (2025-05-08) # dev-python/sigstore is not keyworded everywhere. >=dev-lang/python-3.14 verify-sig
