summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-06-07 11:33:36 +0100
committerSam James <sam@gentoo.org>2023-06-07 11:33:36 +0100
commitda38705a58769604bc1561a23fc7bcd4f60d0056 (patch)
treec362c6cf40063ec1cfbfe8a9108e5981313aad49 /net-misc/freerdp/files
parentsys-block/ndctl: Stabilize 76.1 amd64, #907991 (diff)
downloadgentoo-da38705a58769604bc1561a23fc7bcd4f60d0056.tar.gz
gentoo-da38705a58769604bc1561a23fc7bcd4f60d0056.tar.bz2
gentoo-da38705a58769604bc1561a23fc7bcd4f60d0056.zip
net-misc/freerdp: fix build w/ ffmpeg 6
Closes: https://bugs.gentoo.org/901003 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc/freerdp/files')
-rw-r--r--net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch37
1 files changed, 37 insertions, 0 deletions
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
new file mode 100644
index 000000000000..586ae641b58e
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch
@@ -0,0 +1,37 @@
+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
+