[packages/freerdp2] up to 2.6.0

[atler]

commit cb5c09bc19f548a54d0397ccf28ca9d293ef1ef9
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Feb 22 15:14:16 2022 +0100

    up to 2.6.0

 ffmpeg5.patch | 24 ------------------------
 freerdp2.spec |  9 ++-------
 2 files changed, 2 insertions(+), 31 deletions(-)
---
diff --git a/freerdp2.spec b/freerdp2.spec
index 6ce3de2..899038b 100644
--- a/freerdp2.spec
+++ b/freerdp2.spec
@@ -25,7 +25,6 @@
 %bcond_without	systemd		# systemd journal support
 %bcond_without	wayland		# Wayland client
 %bcond_without	x11		# X11 client
-%bcond_with	x264		# X264 for H.264 codec (only if without ffmpeg and openh264)
 %bcond_without	sse2		# SSE2 and higher instructions (runtime detection with sse patch)
 
 %define	freerdp_api	2
@@ -36,16 +35,15 @@
 Summary:	Remote Desktop Protocol client
 Summary(pl.UTF-8):	Klient protokołu RDP
 Name:		freerdp2
-Version:	2.5.0
+Version:	2.6.0
 Release:	1
 License:	Apache v2.0
 Group:		Applications/Communications
 Source0:	https://pub.freerdp.com/releases/freerdp-%{version}.tar.gz
-# Source0-md5:	eec57a052eaaee74d3467cc74710283e
+# Source0-md5:	3cd5128bc1e6b3822bb84def76245808
 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}
@@ -66,7 +64,6 @@ BuildRequires:	docbook-style-xsl-nons
 %{?with_lame:BuildRequires:	lame-libs-devel}
 %{?with_gsm:BuildRequires:	libgsm-devel}
 BuildRequires:	libjpeg-devel
-%{?with_x264:BuildRequires:	libx264-devel}
 %{?with_openh264:BuildRequires:	openh264-devel}
 # also mbedtls possible
 BuildRequires:	openssl-devel
@@ -196,7 +193,6 @@ wykorzystujących biblioteki FreeRDP 2.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 cat << EOF > xfreerdp.desktop
 [Desktop Entry]
@@ -242,7 +238,6 @@ cd build
 	%{cmake_on_off ffmpeg WITH_SWSCALE} \
 	%{cmake_on_off wayland WITH_WAYLAND} \
 	%{cmake_on_off x11 WITH_X11} \
-	%{cmake_on_off x264 WITH_X264} \
 	-DWITH_XCURSOR=ON \
 	-DWITH_XEXT=ON \
 	-DWITH_XINERAMA=ON \
diff --git a/ffmpeg5.patch b/ffmpeg5.patch
deleted file mode 100644
index 08c1610..0000000
--- a/ffmpeg5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/freerdp2.git/commitdiff/cb5c09bc19f548a54d0397ccf28ca9d293ef1ef9