gentoo auto-resync : 22:12:2023 - 01:53:56

5 files changed, 25 insertions, 188 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 27380840f0cb..5618f4173512 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,16 +1,13 @@
-AUX freerdp-2.10.0-ffmpeg-6.patch 1195 BLAKE2B 49868f42ab24d0754bd11550c5ffffbdf90ff88561f48079d225980de7229a8f3ff8fbe9238d05eff7595405b303c6ef8728b6c29aea863950087e2f9b6aedbc SHA512 de6c8a7c1b31e0da4db5838bcc9607e55ff2c3e780f8924a67c610f85366385d0a91332972750c692136f1cfb6dd9ba009e1615346f2f4834afafc40a85f6dc7
 AUX freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch 10363 BLAKE2B 03dd4e9795feaf6d4ac8a9f0412b5e9baf3b33e732ff13964c7acdb1bfeb884b524f4483e99de808d4130e70f3310366427f3f1b011735ff22442afd92c6888e SHA512 c66b4d2d18d2189f8df9d68ad556ecae2c5fde8d632c5207960bd1adc33d23c3a4a0ac055657388861b96ce8e391d414b4b98c160f89dad890e911535bdde3d6
 AUX freerdp-2.11.2-clang.patch 1132 BLAKE2B ba35de705f66e571e177f1291ccaf3c72f23f4dafe90c6b145b2bfe13d1cc6ec3c0729b6b6d3394da3a090fb73903b775b9d51711416ba0a56786e141d7a2bad SHA512 f45a38b36b5caee74be8b590b80e56adb91b42f41ad8149a97ef2ed0f5c10a32e4024149d75e4eb0b0242f086e71d9367ffd4c9dd307f113f1d25f1cc2c0793e
-DIST freerdp-2.10.0.tar.gz 7321489 BLAKE2B 92b4b45670a5ed3b41713d1e036d41a9ef5714ddf9273a4b88fadf5c8435a467a53144f42bd969a44e641995a7f94b6c7b43b85f0ede738b1a1213e3bada9788 SHA512 a5749e3140d74c66d51869b405852bdaa776ca7d82e50a1e3ed19ccf56ed91a4ad9c3ce2c8ee6ff0abbb29d915c2e7278a1fcea04d73fd5ba4014f6590484477
-DIST freerdp-2.11.0.tar.gz 7325731 BLAKE2B 7cf2805065b870d959461a41b2b5cc7a5d00121078c0a5f51db0f2d83c4a5eb64aba75d0c1e184edf3546b4df87150b30f81ad88b301366ccaeaec59120085ca SHA512 97ce19f392e2b197830e22f12870e787fce85a7d9342cd7b7043c1efc45f5773410901b27de11bf1b70ca36dd6d7d102b3dd34eace813892a72d44dc290a8703
 DIST freerdp-2.11.1.tar.gz 7325835 BLAKE2B 2b6e62cd46627c60c3e815216711d3c5c9839d232aa5cb8653d92870bb46d93c40f2f44e0abf7ef6e5f44d92239541ae44d37366f343a1992fdbc8f09452fba0 SHA512 efd9d44bdc15047322600046fdcd17e37f14c84d75badc77e8ea53da6e065f33725be2f3c03e02031867124b62b32ad9deeabf8cc8f79321e7a866f552e63f2d
 DIST freerdp-2.11.2.tar.gz 7326213 BLAKE2B 5d044d660df1e5115ffde13389be79e852711161ad1969017a9ba662e5f278fc98b86efbc59a24c3ea32a137c24ed308ef5c9eb89db1c24f37f1b8b41bfd3c45 SHA512 2e0e74cba22ed0b33fd6453dd76f6a1ffb3107d1868276faf3eea25bd58d3d869c2ce7c6c467896ecc94ca71c0582beb029a0d44f50df38cc26661f85d0822fb
 DIST freerdp-3.0.0-beta3.tar.gz 8950651 BLAKE2B f5171d76da635bd05b4a267383ffb150b4c214820b79624b1988d297e44a4bfd3d7b34fbc4ac88f79d973e6eb4372700fe53910078eaf36ea7fc553cc6ed6e4f SHA512 a9e61c30254ba5e894c70b981fae4d6311d20546d4352e5a584361b3b7232f6cc075bf7d7c1e9e5a52c820c36a185120f095306ec36ff72489f7dce0cb7e0fbb
-EBUILD freerdp-2.10.0-r3.ebuild 3199 BLAKE2B b88fafb2d7f8a2294a946492c9485798ad534c2a84c8ab320d4aa82911950958a579daf816e7feb6b4cb37fead2240043213a71e0b13e2d47e08a03b237511bc SHA512 22a04348a00384428de52593121dc9cb450ad2ce6cde6b708169bc185314bbfb815338f0554c2d4a22ee19804e5b53c4a24e81aecaf3da3896fb654dd98fa23c
-EBUILD freerdp-2.11.0-r1.ebuild 3247 BLAKE2B ef1fc3d6aeccb4ac0fad19144f14034f784807b58892971cae742fb780115e6af807979c1de87b858eb5bfb0d47670f546c019867aa44912eacea9dc25c67b40 SHA512 abe9e156276fbf9877fb7b1859f7bb4e74cce6b9e0400fe498a0a02db4d407fe469c6119659e0a234c205e6f1b5491a2b34a0bbc81fca1df2b0ad52a2b644adb
+DIST freerdp-3.0.0.tar.gz 9032924 BLAKE2B 45e3ee13a664b947e509100824709088091192e89405f48defd3dfe2f4bf16ca359b37d632db49b7d3ce5e764b2ba7de5b2296c7b703c6a25181db245e8b551f SHA512 7868f6d436e65d2b81e42a6b4073e9775d5336c908294d058023e86c4d5d2b86318bc7ba1ad6093d2d4defdbefa278b8202f6da6e450a4264d3f5cb39eaf02c2
 EBUILD freerdp-2.11.1.ebuild 3382 BLAKE2B d5dea2d7e87eecbaea1b0a40a306be2d5053b03874cc14499764750bf4a5139a2860a9804e2e96a8dfc2fc959100d97b3b210f3edcad5ea6d2f29cb9fc73d58a SHA512 3622e56997255a2f78ff349aeb88899d4e948d8b049cfd24bcb1ca4f7d6669068900aa35ae7e15659adffed01a7f08ca585d254d74353078b70ad56d8f4b44e2
 EBUILD freerdp-2.11.2.ebuild 3388 BLAKE2B 9c9a11d0ff7656b7222dabdff1f802e72880483d8175c1b804576d647512aa148f7294172e279e08664ff03c526bd0cfa754e512215f15f201a4ea4677467fea SHA512 95c104b10bbf6c79735fc87f1db6a1546cff8f419d4d1e0f7cb1720e90922bb516dda39ddbe3cb4d7a72e4f00aa7f1ea453a15165634e686a44b23d681a5b4b5
 EBUILD freerdp-2.9999.ebuild 3247 BLAKE2B ef1fc3d6aeccb4ac0fad19144f14034f784807b58892971cae742fb780115e6af807979c1de87b858eb5bfb0d47670f546c019867aa44912eacea9dc25c67b40 SHA512 abe9e156276fbf9877fb7b1859f7bb4e74cce6b9e0400fe498a0a02db4d407fe469c6119659e0a234c205e6f1b5491a2b34a0bbc81fca1df2b0ad52a2b644adb
+EBUILD freerdp-3.0.0.ebuild 3565 BLAKE2B 15c40d2bad48060145a0386e136fa875b117a4fd000d4dec6a1b5d838e06f443fb742ed07bbe4ff3383673c3f812b9790256b6a8c11a5083dadecdf7e522972e SHA512 26ccae1fcd13c4f75ff2ae32ca6a0ff0c89fe1155e910a5fb28787b66ead4b0fd7029271f333f1e133054731bc8128290ebb736d7da000f6314850c4a3909c16
 EBUILD freerdp-3.0.0_beta3.ebuild 3507 BLAKE2B 354fa785d0c3f5bb4aadbfee128d103d1842ec7c9a345712f125d4003ce3d88dba16e2f8bfdd24a1b423e0d189a0b41938183f4533805ef8af1dd1eb16314dd8 SHA512 9fc2f50123e40afcad6165e5d8432281e6fe4a3c580753932062a40517ffd0976b3a6debfbd7ba26ffc2022b47ff43ceeaf934dbce3ceaff2ceb62597f267f6a
-EBUILD freerdp-9999.ebuild 3571 BLAKE2B 9adb4dea662bd01032e3480cc76caf4488a6187a0e164d91d77e6ec263abc20c7a87b77430ac15e8a6a351413854044d27ef046d48c1f6ea9aef0032590a93a6 SHA512 44b3a41adde9cd4778870d9a375ba26248ad0b68c86e687dd475c8b7d942827d7ec50392fb35fd33ea1af68d9285136a9593dc017128f218df1aa69058b89f68
+EBUILD freerdp-9999.ebuild 3571 BLAKE2B 48c5e1396857d5042963b3552f6e80f4c18614b7fdff609600586918119cec8a3c443710b27ef3ecedf437d2a033ddbe41f1b73c50456e22030722c97f44156e SHA512 277e119c37fea146a8126fa410645ad42fa6e2aaebd022e9b6f52e1d5efc9e4f47da8673240037d046404aa4b36aac2e51945fb0abf6ff5bc08df57174978941
 MISC metadata.xml 599 BLAKE2B abc5045f654a1dee76a0c4352bb2374063a885c1bce2b0ccf43a62cf933119a6aa50bf835c3b35e546d6bbd772100d8523e4f388ebbb43883e5903957799d65e SHA512 7f06ed1615b32380a21e5fe772e0e36c475dc105a78f8766c13158b49526b288d4de81be2649861544acd8cd3ac51720c985ebfe19cb4439f3ea96c67b729c01
diff --git a/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch b/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch
deleted file mode 100644
index 586ae641b58e..000000000000
--- a/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/901003
-https://github.com/FreeRDP/FreeRDP/issues/8686
-https://github.com/FreeRDP/FreeRDP/commit/7f55c97d60453738323e0ecafe6d357019528227
-
-From 7f55c97d60453738323e0ecafe6d357019528227 Mon Sep 17 00:00:00 2001
-From: akallabeth <akallabeth@posteo.net>
-Date: Tue, 14 Feb 2023 07:48:54 +0100
-Subject: [PATCH] Fixed #8686: Update h264 to use new FFMPEG API
-
---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -235,8 +235,10 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYP
- 		}
- 	}
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
- 	if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
- 		mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED;
-+#endif
- 
- 	return TRUE;
- }
---- a/libfreerdp/codec/h264_ffmpeg.c
-+++ b/libfreerdp/codec/h264_ffmpeg.c
-@@ -529,10 +529,12 @@ static BOOL libavcodec_init(H264_CONTEXT* h264)
- 			goto EXCEPTION;
- 		}
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
- 		if (sys->codecDecoder->capabilities & AV_CODEC_CAP_TRUNCATED)
- 		{
- 			sys->codecDecoderContext->flags |= AV_CODEC_FLAG_TRUNCATED;
- 		}
-+#endif
- 
- #ifdef WITH_VAAPI
- 
diff --git a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild
deleted file mode 100644
index ca7d9504ea65..000000000000
--- a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2011-2023 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/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	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
-	)
-	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= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="
-	${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-BDEPEND="
-	virtual/pkgconfig
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ffmpeg-6.patch
-)
-
-src_configure() {
-	# bug #881695
-	filter-lto
-
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
-		-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_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_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)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=()
-	use elibc_musl && myctestargs+=( -E TestBacktrace )
-	cmake_src_test
-}
diff --git a/net-misc/freerdp/freerdp-2.11.0-r1.ebuild b/net-misc/freerdp/freerdp-3.0.0.ebuild
index 2a906f8c6a0d..873cbd5a6144 100644
--- a/net-misc/freerdp/freerdp-2.11.0-r1.ebuild
+++ b/net-misc/freerdp/freerdp-3.0.0.ebuild
@@ -15,20 +15,21 @@ 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"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 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="0/3"
+IUSE="aad alsa cpu_flags_arm_neon cups debug doc +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? (
@@ -49,6 +50,7 @@ RDEPEND="
 	!ffmpeg? (
 		x11-libs/cairo:0=
 	)
+	fuse? ( sys-fs/fuse:3 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -59,6 +61,10 @@ RDEPEND="
 	kerberos? ( virtual/krb5 )
 	openh264? ( media-libs/openh264:0= )
 	pulseaudio? ( media-libs/libpulse )
+	sdl? (
+		media-libs/libsdl2
+		media-libs/sdl2-ttf
+	)
 	server? (
 		X? (
 			x11-libs/libXcursor
@@ -70,7 +76,10 @@ RDEPEND="
 			xinerama? ( x11-libs/libXinerama )
 		)
 	)
-	smartcard? ( sys-apps/pcsc-lite )
+	smartcard? (
+		dev-libs/pkcs11-helper
+		sys-apps/pcsc-lite
+	)
 	systemd? ( sys-apps/systemd:0= )
 	wayland? (
 		dev-libs/wayland
@@ -101,8 +110,10 @@ src_configure() {
 		-Wno-dev
 		-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_CUPS=$(usex cups ON OFF)
 		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
 		-DWITH_MANPAGES=$(usex doc ON OFF)
@@ -110,22 +121,25 @@ src_configure() {
 		-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_ICU=$(usex icu ON OFF)
 		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_GSSAPI=$(usex kerberos 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_PCSC=$(usex smartcard 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
 }
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index ba1f26353110..53737725451f 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="Free implementation of the Remote Desktop Protocol"
 HOMEPAGE="https://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
-SLOT="0/2"
+SLOT="0/3"
 IUSE="aad alsa cpu_flags_arm_neon cups debug doc +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
 RESTRICT="!test? ( test )"