From b3e2df24dd3555e435e88f4f2d0a0840d17fd299 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 9 May 2018 21:59:57 +0200
Subject: [PATCH] debian/patches: Drop 0001-Fix-gstreamer-1.0-detection.patch
 and 0002-fix-nla-don-t-use-server-version.patch. Included in this Git
 snapshot (i.e. 2.0.0~rc2).

---
 .../0001-Fix-gstreamer-1.0-detection.patch    | 25 ------------
 ...002-fix-nla-don-t-use-server-version.patch | 38 -------------------
 2 files changed, 63 deletions(-)
 delete mode 100644 debian/patches/0001-Fix-gstreamer-1.0-detection.patch
 delete mode 100644 debian/patches/0002-fix-nla-don-t-use-server-version.patch

diff --git a/debian/patches/0001-Fix-gstreamer-1.0-detection.patch b/debian/patches/0001-Fix-gstreamer-1.0-detection.patch
deleted file mode 100644
index 2015a13..0000000
--- a/debian/patches/0001-Fix-gstreamer-1.0-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 28 Jul 2017 16:31:41 -0400
-Subject: [PATCH] Fix gstreamer-1.0 detection
-
----
- cmake/FindGStreamer_1_0.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
-index 3aa8fc6..6fbc0ec 100644
---- a/cmake/FindGStreamer_1_0.cmake
-+++ b/cmake/FindGStreamer_1_0.cmake
-@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
- 
-     string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
-     if ("${CMAKE_MATCH_2}" STREQUAL "")
--        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
-+        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GSTREAMER_1_0_MINIMUM_VERSION}")
-     else ()
-         pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
-     endif ()
--- 
-2.1.4
-
diff --git a/debian/patches/0002-fix-nla-don-t-use-server-version.patch b/debian/patches/0002-fix-nla-don-t-use-server-version.patch
deleted file mode 100644
index 14b0043..0000000
--- a/debian/patches/0002-fix-nla-don-t-use-server-version.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From dd415320b78e6f703680aee64f9297909bd34f5e Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <bernhard.miklautz@thincast.com>
-Date: Wed, 14 Mar 2018 16:58:50 +0100
-Subject: [PATCH] fix nla: don't use server version
-
-based on upstream commit e7ae3f6babc881d893411a5ada9156abe8525b2f
----
- libfreerdp/core/nla.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
-index 63966f5..ab9bfb3 100644
---- a/libfreerdp/core/nla.c
-+++ b/libfreerdp/core/nla.c
-@@ -1541,15 +1541,19 @@ BOOL nla_send(rdpNla* nla)
- int nla_decode_ts_request(rdpNla* nla, wStream* s)
- {
- 	int length;
-+	UINT32 version;
- 
- 	/* 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)
- 	{
--- 
-2.11.0
-