Hello, I have prepared a new package with a backported upstream fix for this issue.
This is submitted in salsa as: https://salsa.debian.org/debian-remote-team/freerdp2/-/merge_requests/11 Find this patch attached here for completion. Regards -- Héctor Orón -.. . -... .. .- -. -.. . ...- . .-.. --- .--. . .-.
From 52a4aa3edd5980d257cb3bc61a38ba951033d479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= <zu...@debian.org> Date: Fri, 4 Aug 2023 04:08:27 -0400 Subject: [PATCH] include upstream fix for FTBFS with FFmpeg 6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes DebianBug #1041377 Signed-off-by: Héctor Orón Martínez <zu...@debian.org> --- debian/changelog | 9 ++++++ debian/patches/0001_fix_ftbfs_1041377.patch | 32 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 42 insertions(+) create mode 100644 debian/patches/0001_fix_ftbfs_1041377.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 02eb10a..81b6158 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +freerdp2 (2.10.0+dfsg1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/0001_fix_ftbfs_1041377.patch: + - include upstream fix for FTBFS with FFmpeg 6.0 + (Closes: #1041377) + + -- Héctor Orón Martínez <zu...@debian.org> Fri, 04 Aug 2023 04:08:40 -0400 + freerdp2 (2.10.0+dfsg1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/0001_fix_ftbfs_1041377.patch b/debian/patches/0001_fix_ftbfs_1041377.patch new file mode 100644 index 0000000..14d6536 --- /dev/null +++ b/debian/patches/0001_fix_ftbfs_1041377.patch @@ -0,0 +1,32 @@ +diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +index c14877b43ac1..215337464386 100644 +--- 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; + } +diff --git a/libfreerdp/codec/h264_ffmpeg.c b/libfreerdp/codec/h264_ffmpeg.c +index 4e3ba8f9282f..9c445b8253ae 100644 +--- 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/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..1337965 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001_fix_ftbfs_1041377.patch -- 2.40.1