Rebase against 2660cd9fcbb23897b041c43bcac1dc2a7aa3c01f.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "6b724c3dd8d1ae83e90d4e7e9ec191016fabc7d0"
+	echo "2660cd9fcbb23897b041c43bcac1dc2a7aa3c01f"
 }
 
 # Show version information
@@ -2451,7 +2451,6 @@ fi
 # |
 if test "$enable_mfplat_reverts" -eq 1; then
 	patch_apply mfplat-reverts/0001-Revert-winegstreamer-Fix-return-code-in-init_gst-fai.patch
-	patch_apply mfplat-reverts/0002-Revert-winegstreamer-Replace-source-pad-interface-wi.patch
 	patch_apply mfplat-reverts/0003-Revert-winegstreamer-Allocate-source-media-buffers-i.patch
 	patch_apply mfplat-reverts/0004-Revert-winegstreamer-Duplicate-source-shutdown-path-.patch
 	patch_apply mfplat-reverts/0005-Revert-winegstreamer-Properly-clean-up-from-failure-.patch

patches/widl-SLTG_Typelib_Support/0001-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch

@@ -1,4 +1,4 @@
-From cf653804e70bc54a027bd679cf27468125c46520 Mon Sep 17 00:00:00 2001
+From fbf14812e8eba54d8a4eb369cabbe10174584a02 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Wed, 23 Dec 2015 19:37:37 +0800
 Subject: [PATCH] widl: Add initial implementation of SLTG typelib generator.
@@ -12,19 +12,19 @@ Subject: [PATCH] widl: Add initial implementation of SLTG typelib generator.
  create mode 100644 tools/widl/write_sltg.c
 
 diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
-index a231087f37c..77992cba337 100644
+index 7eb74b813a4..858991f2e74 100644
 --- a/tools/widl/Makefile.in
 +++ b/tools/widl/Makefile.in
-@@ -14,7 +14,8 @@ C_SRCS = \
- 	typetree.c \
+@@ -15,7 +15,8 @@ C_SRCS = \
  	utils.c \
  	widl.c \
+ 	wpp.c \
 -	write_msft.c
 +	write_msft.c \
 +	write_sltg.c
  
- LEX_SRCS   = parser.l
- BISON_SRCS = parser.y
+ LEX_SRCS = \
+ 	parser.l \
 diff --git a/tools/widl/typelib.h b/tools/widl/typelib.h
 index 7df7d290825..5d9f45a7c38 100644
 --- a/tools/widl/typelib.h
@@ -36,7 +36,7 @@ index 7df7d290825..5d9f45a7c38 100644
 +extern int create_sltg_typelib(typelib_t *typelib);
  #endif
 diff --git a/tools/widl/widl.c b/tools/widl/widl.c
-index 8da887ea636..22f8f2602a6 100644
+index 5b1ce6ca689..45288d1a1f9 100644
 --- a/tools/widl/widl.c
 +++ b/tools/widl/widl.c
 @@ -170,6 +170,7 @@ enum {
@@ -55,7 +55,7 @@ index 8da887ea636..22f8f2602a6 100644
      { "output", 0, NULL, 'o' },
      { "prefix-all", 1, NULL, PREFIX_ALL_OPTION },
      { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION },
-@@ -747,6 +749,10 @@ int main(int argc,char *argv[])
+@@ -776,6 +778,10 @@ int main(int argc,char *argv[])
        do_everything = 0;
        do_typelib = 1;
        break;
@@ -634,5 +634,5 @@ index 00000000000..80e3b5f06a3
 +    return 1;
 +}
 -- 
-2.20.1
+2.33.0
 

staging/upstream-commit

@@ -1 +1 @@
-6b724c3dd8d1ae83e90d4e7e9ec191016fabc7d0
+2660cd9fcbb23897b041c43bcac1dc2a7aa3c01f