commit 196569ba2a63c99181a586e562e6f152c6604966
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sun Aug 12 14:24:55 2018 +0200
- up to 20180809
freerdp-gsm.patch | 12 ++++++------
freerdp-nla-KB4088776.patch | 24 ------------------------
freerdp-sse.patch | 20 --------------------
freerdp2.spec | 14 ++++----------
4 files changed, 10 insertions(+), 60 deletions(-)
---
diff --git a/freerdp2.spec b/freerdp2.spec
index 78577f7..ac6d771 100644
--- a/freerdp2.spec
+++ b/freerdp2.spec
@@ -28,20 +28,17 @@ Summary: Remote Desktop Protocol client
Summary(pl.UTF-8): Klient protokołu RDP
Name: freerdp2
Version: 2.0.0
-%define snap 20170724
-%define gitref 84f8161897534d9263ffebe43092827d40fc7ffb
-%define rel 3
+%define snap 20180809
+%define gitref dd26659ab0be7f1c841323064c6fbf8adb609fe5
+%define rel 1
Release: 0.%{snap}.%{rel}
License: Apache v2.0
Group: Applications/Communications
Source0:
https://github.com/FreeRDP/FreeRDP/archive/%{gitref}/freerdp-%{version}-%{snap}.tar.gz
-# Source0-md5: 2dc380b5ccfd84fdeec5f0225ffd3d45
+# Source0-md5: 907e2e2eb7de98855a2046e64e41390f
Patch0: freerdp-DirectFB-include.patch
Patch1: freerdp-opt.patch
Patch2: freerdp-gsm.patch
-Patch3: freerdp-sse.patch
-Patch4: freerdp-nla-KB4088776.patch
-Patch5: ffmpeg4.patch
URL: http://www.freerdp.com/
%{?with_directfb:BuildRequires: DirectFB-devel}
%{?with_alsa:BuildRequires: alsa-lib-devel}
@@ -184,9 +181,6 @@ wykorzystujących biblioteki FreeRDP 2.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
cat << EOF > xfreerdp.desktop
[Desktop Entry]
diff --git a/freerdp-gsm.patch b/freerdp-gsm.patch
index 6718455..96a76f0 100644
--- a/freerdp-gsm.patch
+++ b/freerdp-gsm.patch
@@ -7,14 +7,14 @@
find_library(GSM_LIBRARY gsm)
----
FreeRDP-a132545545ef90534a64a08f5199741502de97e5/channels/rdpsnd/client/pulse/rdpsnd_pulse.c.orig
2016-06-30 22:43:05.000000000 +0200
-+++
FreeRDP-a132545545ef90534a64a08f5199741502de97e5/channels/rdpsnd/client/pulse/rdpsnd_pulse.c
2016-07-02 20:10:48.938883624 +0200
-@@ -34,7 +34,7 @@
- #include <pulse/pulseaudio.h>
+--- a/libfreerdp/codec/dsp.c~ 2018-08-09 10:41:56.000000000 +0200
++++ b/libfreerdp/codec/dsp.c 2018-08-12 14:19:24.735710945 +0200
+@@ -31,7 +31,7 @@
+ #include <freerdp/codec/dsp.h>
- #ifdef WITH_GSM
+ #if defined(WITH_GSM)
-#include <gsm/gsm.h>
+#include <gsm.h>
#endif
- #include <freerdp/types.h>
+ #if defined(WITH_LAME)
diff --git a/freerdp-nla-KB4088776.patch b/freerdp-nla-KB4088776.patch
deleted file mode 100644
index 6a6b2af..0000000
--- a/freerdp-nla-KB4088776.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruNp
FreeRDP-84f8161897534d9263ffebe43092827d40fc7ffb.orig/libfreerdp/core/nla.c
FreeRDP-84f8161897534d9263ffebe43092827d40fc7ffb/libfreerdp/core/nla.c
----
FreeRDP-84f8161897534d9263ffebe43092827d40fc7ffb.orig/libfreerdp/core/nla.c
2017-11-28 15:26:30.000000000 +0100
-+++ FreeRDP-84f8161897534d9263ffebe43092827d40fc7ffb/libfreerdp/core/nla.c
2018-03-22 13:36:50.163380787 +0100
-@@ -1663,15 +1663,19 @@ BOOL nla_send(rdpNla* nla)
- static int nla_decode_ts_request(rdpNla* nla, wStream* s)
- {
- int length;
-+ UINT32 version = 0;
-
- /* TSRequest */
- if (!ber_read_sequence_tag(s, &length) ||
- !ber_read_contextual_tag(s, 0, &length, TRUE) ||
-- !ber_read_integer(s, &nla->version))
-+ !ber_read_integer(s, &version))
- {
- return -1;
- }
-
-+ if (version < nla->version)
-+ nla->version = version;
-+
- /* [1] negoTokens (NegoData) */
- if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE)
- {
diff --git a/freerdp-sse.patch b/freerdp-sse.patch
deleted file mode 100644
index 6537683..0000000
--- a/freerdp-sse.patch
+++ /dev/null
@@ -1,20 +0,0 @@
----
FreeRDP-06d47530b6501ce09f649814f5023c3dd88ce5a0/libfreerdp/codec/nsc_sse2.c.orig
2016-11-18 12:46:14.000000000 +0100
-+++
FreeRDP-06d47530b6501ce09f649814f5023c3dd88ce5a0/libfreerdp/codec/nsc_sse2.c
2016-12-03 09:01:03.673102526 +0100
-@@ -30,6 +30,7 @@
-
- #include <freerdp/codec/color.h>
- #include <winpr/crt.h>
-+#include <winpr/sysinfo.h>
-
- #include "nsc_types.h"
- #include "nsc_sse2.h"
-@@ -400,6 +401,9 @@
-
- void nsc_init_sse2(NSC_CONTEXT* context)
- {
-+ if (IsProcessorFeaturePresent(PF_SSE2_INSTRUCTIONS_AVAILABLE))
-+ {
- IF_PROFILER(context->priv->prof_nsc_encode->name = "nsc_encode_sse2");
- context->encode = nsc_encode_sse2;
-+ }
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/freerdp2.git/commitdiff/196569ba2a63c99181a586e562e6f152c6604966
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
