wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Updated include-macos-compile patchset

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2019-05-17 10:45:44 +10:00
parent 071fe01910
commit 831b1f895e
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
patches/include-macos-compile/0002-wineqtdecoder-Fix-compile-on-MacOS.patch Normal file
View File

@ -0,0 +1,28 @@
From e633de8aa0a8d5eaf2b47c3b4ad1c3bfc6a7f9c3 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 17 May 2019 10:43:32 +1000
Subject: [PATCH] wineqtdecoder: Fix compile on MacOS
Regression of 0f9e4cd6600713628c92e3ceb40bd8aa38084f30
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
dlls/wineqtdecoder/qtvdecoder.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c
index 4e8278b..4ad73d8 100644
--- a/dlls/wineqtdecoder/qtvdecoder.c
+++ b/dlls/wineqtdecoder/qtvdecoder.c
@@ -533,7 +533,7 @@ IUnknown * CALLBACK QTVDecoder_create(IUnknown * pUnkOuter, HRESULT* phr)
return NULL;
}
- hr = TransformFilter_Construct(sizeof(QTVDecoderImpl), &CLSID_QTVDecoder,
+ hr = strmbase_transform_create(sizeof(QTVDecoderImpl), &CLSID_QTVDecoder,
&QTVDecoder_FuncsTable, (IBaseFilter **)&This);
if (FAILED(hr))
--
1.9.1

4
patches/patchinstall.sh
View File

@ -4077,12 +4077,14 @@ fi
# Patchset include-macos-compile
# |
# | Modified files:
# | * include/winerror.h
# | * dlls/wineqtdecoder/qtvdecoder.c, include/winerror.h
# |
if test "$enable_include_macos_compile" -eq 1; then
patch_apply include-macos-compile/0001-include-Stop-macro-redefined-on-the-mac-build.patch
patch_apply include-macos-compile/0002-wineqtdecoder-Fix-compile-on-MacOS.patch
(
printf '%s\n' '+ { "Alistair Leslie-Hughes", "include: Stop macro redefined on the mac build.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "wineqtdecoder: Fix compile on MacOS.", 1 },';
) >> "$patchlist"
fi