Merge updates from master

2026-09-24 04:59:14 -07:00 · 2026-09-24 02:00:48 +00:00
parent c184813411 5db31c55d9
commit 04e63b0ed7
2 changed files with 194 additions and 0 deletions
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,2 +1,4 @@
 DIST freerdp-3.31.1.tar.gz 11111567 BLAKE2B 97d47a4daab1341b558212da34c580543fc9c62d5e4fa6ea71b230a8b79b8c5aa2d960aa49294b48f19fcf27f0a6d81cae9c75d3987477c8ff964a1ec71d723b SHA512 708fa170d70c01cbd5b16b2bc0359092114e0158c3a76c38862b58b19bc2757a467656cf0f326cd9e81c366f2a9c1ff11073a099ee81304006556dac0d8b5a7e
 DIST freerdp-3.31.1.tar.gz.asc 228 BLAKE2B 6b009b8969c06a2123469eadf02a85a18567a541b745b7a7a82324dd3c27faa99f53c05846933ee24001686f4bc297d32d48a9f4d7f82045161d94bf7586f0f5 SHA512 5c9bfc3cb28cc900cce93f9b9f94e41e3e7ed1ee1b87c68d46bed260ddc294bab3035676a2361e8943c5d6be8791c237f89032e04dc772e16d0bc6117d13ded9
+DIST freerdp-3.32.0.tar.gz 11264313 BLAKE2B 504f634cd957f9b83e16ea854877794423dce7b7bfa89278c6511077847aab9c93f8efeb2bead346e0340cae28607c183fee3514b93feda97a43f61dc27dbd0d SHA512 e85d3c1ac2a878fa1623a25ddb60b7d0790ce0892c57d8bc916b384936041f61e05dbf101d2a0a96386b6a49aab7e30f2d6506efe579975cc9c3fda288e1bdcf
+DIST freerdp-3.32.0.tar.gz.asc 228 BLAKE2B ce3dd777e3480bdd7f4a48bc4f515b3c5ca80b612109e76e675e18b4726c89c7092965da75a3ed3243c5cef192be3208341cbe8bb4d54033efec97cecf32e06d SHA512 3a854956caf8b4ef59451b59d3c97d831680b87a2141316e9056b2726a6e93cdaa0801219b42cc058e23049628a335f53f8f0dfc54234fc49c776cd6a21ed452
--- a/net-misc/freerdp/freerdp-3.32.0.ebuild
+++ b/net-misc/freerdp/freerdp-3.32.0.ebuild
@@ -0,0 +1,192 @@
+# Copyright 2011-2026 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="3"
+IUSE="aad alsa camera cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland winpr-tools X xinerama xv"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+	virtual/pkgconfig
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+"
+COMMON_DEPEND="
+	dev-libs/openssl:0=
+	virtual/zlib:=
+	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 )
+	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? (
+		camera? ( media-libs/libv4l )
+		sdl? (
+			media-libs/libsdl3
+			media-libs/sdl3-ttf
+		)
+		wayland? (
+			dev-libs/wayland
+			x11-libs/libxkbcommon
+		)
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		ffmpeg? ( media-video/ffmpeg:0[x264(-)] )
+	)
+	valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/freerdp:0
+	client? ( !net-misc/freerdp:2[client] )
+	server? ( !net-misc/freerdp:2[server] )
+	smartcard? ( app-crypt/p11-kit )
+"
+
+option() {
+	usex "$1" ON OFF
+}
+
+option_client() {
+	if use client; then
+		option "$1"
+	else
+		echo OFF
+	fi
+}
+
+src_configure() {
+	use debug || append-cppflags -DNDEBUG
+	local mycmakeargs=(
+		-Wno-dev
+
+		-DBUILD_TESTING=$(option test)
+
+		# https://bugs.gentoo.org/927037
+		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
+
+		-DCHANNEL_URBDRC=$(option usb)
+		-DCHANNEL_RDPECAM_CLIENT=$(option_client camera)
+		-DWITH_AAD=$(option aad)
+		-DWITH_ALSA=$(option alsa)
+		-DWITH_CCACHE=OFF
+		-DWITH_CLIENT=$(option client)
+		-DWITH_CLIENT_SDL2=OFF
+		-DWITH_CLIENT_SDL3=$(option_client sdl)
+		-DWITH_SAMPLE=OFF
+		-DWITH_CUPS=$(option cups)
+		-DWITH_DEBUG_ALL=$(option debug)
+		-DWITH_VERBOSE_WINPR_ASSERT=$(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 winpr-tools)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# TestBacktrace: bug 930636
+	# TestSynchCritical, TestSynchMultipleThreads: bug 951301
+	local CMAKE_SKIP_TESTS=( TestBacktrace TestSynchCritical TestSynchMultipleThreads )
+	if has network-sandbox ${FEATURES}; then
+		CMAKE_SKIP_TESTS+=( TestConnect )
+	fi
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die
+}