build fixes for ffmpeg5

diff --git a/ffmpeg5.patch b/ffmpeg5.patch
new file mode 100644 (file)
index 0000000..08c1610
--- /dev/null
+++ b/ffmpeg5.patch
@@ -0,0 +1,24 @@
+--- freerdp-2.5.0/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig       2022-01-12 10:55:33.000000000 +0100
++++ freerdp-2.5.0/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c    2022-01-24 13:55:06.447554471 +0100
+@@ -615,7 +615,9 @@
+ static INIT_ONCE g_Initialized = INIT_ONCE_STATIC_INIT;
+ static BOOL CALLBACK InitializeAvCodecs(PINIT_ONCE once, PVOID param, PVOID* context)
+ {
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 137, 100)
+       avcodec_register_all();
++#endif
+       return TRUE;
+ }
+ 
+--- freerdp-2.5.0/libfreerdp/codec/dsp_ffmpeg.c.orig   2022-01-24 14:27:49.787885307 +0100
++++ freerdp-2.5.0/libfreerdp/codec/dsp_ffmpeg.c        2022-01-24 14:28:58.954285682 +0100
+@@ -571,7 +571,9 @@
+ FREERDP_DSP_CONTEXT* freerdp_dsp_ffmpeg_context_new(BOOL encode)
+ {
+       FREERDP_DSP_CONTEXT* context;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 137, 100)
+       avcodec_register_all();
++#endif
+       context = calloc(1, sizeof(FREERDP_DSP_CONTEXT));
+ 
+       if (!context)

diff --git a/freerdp2.spec b/freerdp2.spec
index 56670ad124fd8546893c061d73d349c7ad70875b..6ce3de2e5b56a8f7c94d8a28246d61667c916787 100644 (file)
--- a/freerdp2.spec
+++ b/freerdp2.spec
@@ -45,6 +45,7 @@ Source0:      https://pub.freerdp.com/releases/freerdp-%{version}.tar.gz
 Patch0:                freerdp-opt.patch
 Patch1:                freerdp-gsm.patch
 Patch2:                docbook-xsl.patch
+Patch3:                ffmpeg5.patch
 URL:           http://www.freerdp.com/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 %{?with_opencl:BuildRequires:  OpenCL-devel}
@@ -195,6 +196,7 @@ wykorzystujących biblioteki FreeRDP 2.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 cat << EOF > xfreerdp.desktop
 [Desktop Entry]