commit f9066b2edfdb3549aaab522d2d50ce0dedd70c02
Author: Jan Palus <[email protected]>
Date: Fri Apr 10 12:50:51 2020 +0200
up to final 2.0.0
- remove ffmpeg4 patch dropped from spec in 196569b
ffmpeg4.patch | 36 ------------------------------------
freerdp2.spec | 11 ++++-------
2 files changed, 4 insertions(+), 43 deletions(-)
---
diff --git a/freerdp2.spec b/freerdp2.spec
index 62120fb..d680125 100644
--- a/freerdp2.spec
+++ b/freerdp2.spec
@@ -31,14 +31,11 @@ Summary: Remote Desktop Protocol client
Summary(pl.UTF-8): Klient protokołu RDP
Name: freerdp2
Version: 2.0.0
-%define snap 20200115
-%define gitref 30d6e25def7aa924eb8dc104f830996977cf0958
-%define rel 1
-Release: 0.%{snap}.%{rel}
+Release: 1
License: Apache v2.0
Group: Applications/Communications
-Source0:
https://github.com/FreeRDP/FreeRDP/archive/%{gitref}/freerdp-%{version}-%{snap}.tar.gz
-# Source0-md5: f0c23b3ffc66f9d65d3f5fc095e53de8
+Source0: https://pub.freerdp.com/releases/freerdp-%{version}.tar.gz
+# Source0-md5: 946433aa3ac034e8440f99dfaf6aec03
Patch0: freerdp-opt.patch
Patch1: freerdp-gsm.patch
URL: http://www.freerdp.com/
@@ -181,7 +178,7 @@ Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
wykorzystujących biblioteki FreeRDP 2.
%prep
-%setup -q -n FreeRDP-%{gitref}
+%setup -q -n freerdp-%{version}
%patch0 -p1
%patch1 -p1
diff --git a/ffmpeg4.patch b/ffmpeg4.patch
deleted file mode 100644
index 5029afa..0000000
--- a/ffmpeg4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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/f9066b2edfdb3549aaab522d2d50ce0dedd70c02
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
