[packages/freerdp] - fix building with ffmpeg 4.0 - rel 8

baggins baggins at pld-linux.org
Sun Apr 29 09:48:23 CEST 2018


commit 8c4de8e2a18590bba6d6832c2be67654586f0555
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 29 09:48:09 2018 +0200

    - fix building with ffmpeg 4.0
    - rel 8

 ffmpeg4.patch | 13 +++++++++++++
 freerdp.spec  |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/freerdp.spec b/freerdp.spec
index b06c3e0..c984abc 100644
--- a/freerdp.spec
+++ b/freerdp.spec
@@ -17,13 +17,14 @@ Summary:	Remote Desktop Protocol client
 Summary(pl.UTF-8):	Klient protokołu RDP
 Name:		freerdp
 Version:	1.0.2
-Release:	7
+Release:	8
 License:	Apache v2.0
 Group:		Applications/Communications
 Source0:	http://pub.freerdp.com/releases/%{name}-%{version}.tar.gz
 # Source0-md5:	08f0e07d8d77e142f7dc39e4033a458d
 Patch0:		%{name}-ffmpeg.patch
 Patch1:		ffmpeg3.patch
+Patch2:		ffmpeg4.patch
 URL:		http://www.freerdp.com/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
@@ -190,6 +191,7 @@ Wtyczki PulseAudio do obsługi dźwięku RDP.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 cat << EOF > xfreerdp.desktop
 [Desktop Entry]
diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644
index 0000000..320eff2
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,13 @@
+--- freerdp-1.0.2/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c~	2018-04-29 09:45:20.000000000 +0200
++++ freerdp-1.0.2/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c	2018-04-29 09:46:56.321113085 +0200
+@@ -154,8 +154,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/freerdp.git/commitdiff/8c4de8e2a18590bba6d6832c2be67654586f0555



More information about the pld-cvs-commit mailing list