Accepting request 1108337 from X11:RemoteDesktop

OBS-URL: https://build.opensuse.org/request/show/1108337
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freerdp?expand=0&rev=67

FreeRDP-2.10.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:88fa59f8e8338d5cb2490d159480564562a5624f3a3572c89fa3070b9626835c
-size 7322385

FreeRDP-2.11.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ccc342d4616c89323c355704d47ab45f6a770559cfff1b3965356d2313d3c3cc
+size 7331882

Update_h264_to_use_new_FFMPEG_API.patch

@@ -1,42 +0,0 @@
-From c5d91f8ef584174310970d0f7e31d6ffad7c5246 Mon Sep 17 00:00:00 2001
-From: akallabeth <akallabeth@posteo.net>
-Date: Tue, 14 Feb 2023 07:48:54 +0100
-Subject: [PATCH] Fixed #8686: Update h264 to use new FFMPEG API
-
----
- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 2 ++
- libfreerdp/codec/h264_ffmpeg.c            | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-index c14877b43ac..21533746438 100644
---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -235,8 +235,10 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYP
- 		}
- 	}
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
- 	if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
- 		mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED;
-+#endif
- 
- 	return TRUE;
- }
-diff --git a/libfreerdp/codec/h264_ffmpeg.c b/libfreerdp/codec/h264_ffmpeg.c
-index 4e3ba8f9282..9c445b8253a 100644
---- a/libfreerdp/codec/h264_ffmpeg.c
-+++ b/libfreerdp/codec/h264_ffmpeg.c
-@@ -529,10 +529,12 @@ static BOOL libavcodec_init(H264_CONTEXT* h264)
- 			goto EXCEPTION;
- 		}
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
- 		if (sys->codecDecoder->capabilities & AV_CODEC_CAP_TRUNCATED)
- 		{
- 			sys->codecDecoderContext->flags |= AV_CODEC_FLAG_TRUNCATED;
- 		}
-+#endif
- 
- #ifdef WITH_VAAPI
- 

freerdp.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Aug 30 16:48:44 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Update to 2.11.0
+  * Various input validation fixes
+  * Added various CMake options #9317
+  * LibreSSL build fixes #8709
+  * Big endian support
+  * Mouse grabbing support
+  * wayland scrolling fix
+  * Update h264 to use new FFMPEG API
+  * early bail from update_read_window_state_order breaks protocol
+  * rdpecam/server: Remove wrong assertion
+  * bounds checks for gdi/gfx rectangles
+  * enforce rdpdr client side state checks
+  * deactivate mouse grabbing by default
+  * channels/cliprdr: Fix writing incorrect PDU type for unlock
+    PDUs
+- Drop patch, now upstream:
+  * Update_h264_to_use_new_FFMPEG_API.patch
+
 -------------------------------------------------------------------
 Wed May 31 13:15:32 UTC 2023 - Andreas Schwab <schwab@suse.de>
 

freerdp.spec

@@ -36,7 +36,7 @@
 %define uwac_package %{uwac_version}-%{uwac_version}
 
 Name:           freerdp
-Version:        2.10.0
+Version:        2.11.0
 Release:        0
 Summary:        Remote Desktop Viewer Client
 License:        Apache-2.0
@@ -46,8 +46,6 @@ Source0:        https://github.com/FreeRDP/FreeRDP/archive/%{version}.tar.gz#/Fr
 Source1:        freerdp-rpmlintrc
 # PATCH-FIX-UPSTREAM https://github.com/FreeRDP/FreeRDP/pull/7476
 Patch0:         0001-Make-H.264-codec-optional-during-runtime.patch
-# PATCH-FIX-UPSTREAM https://github.com/FreeRDP/FreeRDP/commit/c5d91f8ef584174310970d0f7e31d6ffad7c5246.patch
-Patch1:         Update_h264_to_use_new_FFMPEG_API.patch
 BuildRequires:  chrpath
 BuildRequires:  cmake >= 2.8
 BuildRequires:  cups-devel
@@ -202,31 +200,31 @@ find . -type f -name "*.c" -exec perl -i -pe 's{__(DATE|TIME)__}{""}g' "{}" "+"
 fi
 
 %cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DCMAKE_INSTALL_LIBDIR=%{_lib} \
+        -DCMAKE_INSTALL_LIBDIR=%{_lib} \
-	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	-DCMAKE_EXE_LINKER_FLAGS="-pie" \
+        -DCMAKE_EXE_LINKER_FLAGS="-pie" \
-	-DWITH_ALSA=ON \
+        -DWITH_ALSA=ON \
-	-DWITH_CAIRO=ON \
+        -DWITH_CAIRO=ON \
-	-DWITH_CUPS=ON \
+        -DWITH_CUPS=ON \
-	-DWITH_CHANNELS=ON -DBUILTIN_CHANNELS=OFF \
+        -DWITH_CHANNELS=ON -DBUILTIN_CHANNELS=OFF \
-	-DWITH_PLUGIN_RPATH_ONLY=ON \
+        -DWITH_PLUGIN_RPATH_ONLY=ON \
         -DWITH_CLIENT=ON \
         -DWITH_DIRECTFB=OFF \
         -DWITH_FFMPEG=%{?_with_ffmpeg:ON}%{?!_with_ffmpeg:OFF} \
-	-DWITH_GSM=ON \
+        -DWITH_GSM=ON \
-	-DWITH_GSSAPI=%{?_with_gss:ON}%{?!_with_gss:OFF} \
+        -DWITH_GSSAPI=%{?_with_gss:ON}%{?!_with_gss:OFF} \
         -DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF \
         -DWITH_ICU=ON \
         -DWITH_IPP=OFF \
-	-DWITH_JPEG=ON \
+        -DWITH_JPEG=ON \
         -DWITH_LAME=%{?_with_lame:ON}%{?!_with_lame:OFF} \
         -DWITH_MANPAGES=ON \
         -DWITH_OPENH264=%{?_with_openh264:ON}%{?!_with_openh264:OFF} \
         -DWITH_OPENSSL=ON \
-	-DWITH_PCSC=ON \
+        -DWITH_PCSC=ON \
         -DWITH_PULSE=ON \
-	-DWITH_SERVER=ON \
+        -DWITH_SERVER=ON \
         -DWITH_SERVER_INTERFACE=ON \
         -DWITH_SHADOW_X11=ON \
         -DWITH_SHADOW_MAC=ON \
@@ -259,9 +257,9 @@ fi
         -DARM_FP_ABI=soft \
         -DWITH_NEON=OFF \
 %endif
-	-DCHANNEL_GEOMETRY=ON -DCHANNEL_GEOMETRY_CLIENT=ON \
+        -DCHANNEL_GEOMETRY=ON -DCHANNEL_GEOMETRY_CLIENT=ON \
-	-DCHANNEL_URBDRC=ON \
+        -DCHANNEL_URBDRC=ON \
-	-DCHANNEL_URBDRC_CLIENT=ON
+        -DCHANNEL_URBDRC_CLIENT=ON
 
 %make_build