From 6ca029a4f64d40135bb8b1263f6c5531c91be220 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 5 Jun 2017 13:00:54 +0200
Subject: [PATCH] Rebase against e5733e7cd40b41bb4d8c0409e9ed5be8fe6d5618.

---
 ...cndr.h-Fix-definition-of-EXTERN_GUID.patch | 27 -------------------
 patches/patchinstall.sh                       |  7 ++---
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 patches/mfplat-MFTRegister/0007-include-rpcndr.h-Fix-definition-of-EXTERN_GUID.patch

diff --git a/patches/mfplat-MFTRegister/0007-include-rpcndr.h-Fix-definition-of-EXTERN_GUID.patch b/patches/mfplat-MFTRegister/0007-include-rpcndr.h-Fix-definition-of-EXTERN_GUID.patch
deleted file mode 100644
index 8f71a271..00000000
--- a/patches/mfplat-MFTRegister/0007-include-rpcndr.h-Fix-definition-of-EXTERN_GUID.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 322b917bad2ab43eb5181a429f1360ce9aca384b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 26 Mar 2016 06:03:56 +0100
-Subject: include/rpcndr.h: Fix definition of EXTERN_GUID.
-
----
- include/rpcndr.h | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/include/rpcndr.h b/include/rpcndr.h
-index f795566..9029950 100644
---- a/include/rpcndr.h
-+++ b/include/rpcndr.h
-@@ -45,9 +45,7 @@ extern "C" {
- 	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
- #else
- #define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
--        const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \
--        const GUID DECLSPEC_SELECTANY name = \
--	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
-+        EXTERN_C const GUID name
- #endif
- #endif
- 
--- 
-2.7.1
-
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 0ee40383..5c22f923 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "6c752aaf8da225365b2bdbbf3c43d41afd4d1344"
+	echo "e5733e7cd40b41bb4d8c0409e9ed5be8fe6d5618"
 }
 
 # Show version information
@@ -5111,16 +5111,13 @@ fi
 # |   *	[#39367] Return stub interface from mf.MFCreateMediaSession
 # |
 # | Modified files:
-# |   *	dlls/mf/Makefile.in, dlls/mf/main.c, dlls/mf/mf.spec, dlls/mf/mf_private.h, dlls/mf/session.c, dlls/mf/topology.c,
-# | 	include/rpcndr.h
+# |   *	dlls/mf/Makefile.in, dlls/mf/main.c, dlls/mf/mf.spec, dlls/mf/mf_private.h, dlls/mf/session.c, dlls/mf/topology.c
 # |
 if test "$enable_mfplat_MFTRegister" -eq 1; then
 	patch_apply mfplat-MFTRegister/0006-mf-Add-stub-for-MFCreateMediaSession.patch
-	patch_apply mfplat-MFTRegister/0007-include-rpcndr.h-Fix-definition-of-EXTERN_GUID.patch
 	patch_apply mfplat-MFTRegister/0008-mf-Implement-IMFMediaSession-stub-interface.patch
 	(
 		printf '%s\n' '+    { "Michael Müller", "mf: Add stub for MFCreateMediaSession.", 1 },';
-		printf '%s\n' '+    { "Michael Müller", "include/rpcndr.h: Fix definition of EXTERN_GUID.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "mf: Implement IMFMediaSession stub interface.", 1 },';
 	) >> "$patchlist"
 fi