commit ee2fd01269a1a6f83a74d69b751aeba175fd59be
Author: Jan Rękorajski <[email protected]>
Date: Sun Apr 29 09:53:33 2018 +0200
- fix building with ffmpeg 4.0
- rel 3
ffmpeg4.patch | 36 ++++++++++++++++++++++++++++++++++++
freerdp2.spec | 4 +++-
2 files changed, 39 insertions(+), 1 deletion(-)
---
diff --git a/freerdp2.spec b/freerdp2.spec
index 5e5e016..78577f7 100644
--- a/freerdp2.spec
+++ b/freerdp2.spec
@@ -30,7 +30,7 @@ Name: freerdp2
Version: 2.0.0
%define snap 20170724
%define gitref 84f8161897534d9263ffebe43092827d40fc7ffb
-%define rel 2
+%define rel 3
Release: 0.%{snap}.%{rel}
License: Apache v2.0
Group: Applications/Communications
@@ -41,6 +41,7 @@ Patch1: freerdp-opt.patch
Patch2: freerdp-gsm.patch
Patch3: freerdp-sse.patch
Patch4: freerdp-nla-KB4088776.patch
+Patch5: ffmpeg4.patch
URL: http://www.freerdp.com/
%{?with_directfb:BuildRequires: DirectFB-devel}
%{?with_alsa:BuildRequires: alsa-lib-devel}
@@ -185,6 +186,7 @@ wykorzystujących biblioteki FreeRDP 2.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
cat << EOF > xfreerdp.desktop
[Desktop Entry]
diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644
index 0000000..5029afa
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,36 @@
+--- FreeRDP/libfreerdp/codec/h264_ffmpeg.c~ 2017-11-28 15:26:30.000000000
+0100
++++ FreeRDP/libfreerdp/codec/h264_ffmpeg.c 2018-04-29 09:50:33.774939164
+0200
+@@ -146,7 +146,7 @@
+ };
+ av_opt_set(sys->codecEncoderContext, "preset", "veryfast",
AV_OPT_SEARCH_CHILDREN);
+ av_opt_set(sys->codecEncoderContext, "tune", "zerolatency",
AV_OPT_SEARCH_CHILDREN);
+- sys->codecEncoderContext->flags |= CODEC_FLAG_LOOP_FILTER;
++ sys->codecEncoderContext->flags |= AV_CODEC_FLAG_LOOP_FILTER;
+ sys->codecEncoderContext->me_cmp |= 1;
+ sys->codecEncoderContext->me_subpel_quality = 3;
+ sys->codecEncoderContext->me_range = 16;
+@@ -404,9 +404,9 @@
+ goto EXCEPTION;
+ }
+
+- if (sys->codecDecoder->capabilities & CODEC_CAP_TRUNCATED)
++ if (sys->codecDecoder->capabilities & AV_CODEC_CAP_TRUNCATED)
+ {
+- sys->codecDecoderContext->flags |= CODEC_FLAG_TRUNCATED;
++ sys->codecDecoderContext->flags |=
AV_CODEC_FLAG_TRUNCATED;
+ }
+
+ if (avcodec_open2(sys->codecDecoderContext, sys->codecDecoder,
NULL) < 0)
+--- FreeRDP/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c~ 2017-11-28
15:26:30.000000000 +0100
++++ FreeRDP/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2018-04-29
09:51:28.065681976 +0200
+@@ -207,8 +207,8 @@
+ }
+ }
+
+- if (mdecoder->codec->capabilities & CODEC_CAP_TRUNCATED)
+- mdecoder->codec_context->flags |= CODEC_FLAG_TRUNCATED;
++ if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED;
+ return TRUE;
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/freerdp2.git/commitdiff/ee2fd01269a1a6f83a74d69b751aeba175fd59be
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
