spaced30/freerdp
SHA256
1
0
Fork 0
forked from pool/freerdp
Code Pull Requests Activity

Accepting request 935219 from X11:RemoteDesktop

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/935219
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freerdp?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger 2021-12-06 22:59:28 +00:00 committed by Git OBS Bridge
commit cab478b3e8
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-Make-H.264-codec-optional-during-runtime.patch Normal file
View File

@ -0,0 +1,32 @@
From 24b8b4e5df644ba77c673c41b90cc48c4358aaa0 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
Date: Thu, 2 Dec 2021 15:50:08 +0100
Subject: [PATCH] Make H.264 codec optional during runtime
It's possible that FreeRDP was built against FFmpeg, but it doesn't support
H.264. In that case, just continue without H.264 support instead of failing
hard before even trying to connect.
This is especially useful for Linux distributions which can't ship H.264
support in FFmpeg out of the box (patent issues), but allow enabling H.264
later by installing a version of FFmpeg which has it enabled.
---
libfreerdp/core/codecs.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
Index: FreeRDP-2.4.1/libfreerdp/core/codecs.c
===================================================================
--- FreeRDP-2.4.1.orig/libfreerdp/core/codecs.c
+++ FreeRDP-2.4.1/libfreerdp/core/codecs.c
@@ -106,10 +106,7 @@ BOOL freerdp_client_codecs_prepare(rdpCo
if (!(codecs->h264 = h264_context_new(FALSE)))
{
- WLog_ERR(TAG, "Failed to create h264 codec context");
-#ifndef WITH_OPENH264_LOADING
- return FALSE;
-#endif
+ WLog_WARN(TAG, "Failed to create h264 codec context");
}
}
#endif

7
freerdp.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Dec 2 15:02:32 UTC 2021 - Fabian Vogt <fvogt@suse.com>
- Add patch to fix connecting without H.264-enabled FFmpeg (boo#1190823):
* 0001-Make-H.264-codec-optional-during-runtime.patch
- Use %autosetup
-------------------------------------------------------------------
Thu Oct 21 10:15:38 UTC 2021 - Johannes Weberhofer <jweberhofer@weberhofer.at>

5
freerdp.spec
View File

@ -49,6 +49,8 @@ Source0: https://github.com/FreeRDP/FreeRDP/archive/%{version}.tar.gz#/Fr
Source1: freerdp-rpmlintrc
# PATCH-FIX-UPSTREAM freerdp-channels-off-link-fix.diff -- based on https://github.com/FreeRDP/FreeRDP/pull/7235
Patch0: freerdp-builtin-channels-off-link-fix.diff
# PATCH-FIX-UPSTREAM https://github.com/FreeRDP/FreeRDP/pull/7476
Patch1: 0001-Make-H.264-codec-optional-during-runtime.patch
BuildRequires: chrpath
BuildRequires: cmake >= 2.8
BuildRequires: cups-devel
@ -195,8 +197,7 @@ This package contains header files for developing applications that
use the uwac library.
%prep
%setup -q -n FreeRDP-%{version}
%autopatch -p1
%autosetup -p1 -n FreeRDP-%{version}
%build
if [ -z "$SOURCE_DATE_EPOCH" ]; then