qtmultimedia: mingw-w64 6 compatibility

This commit is contained in:
Mark Brand 2018-09-17 00:48:57 +02:00
parent ab63adc6b8
commit 345463e921
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,30 @@
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 17 Sep 2018 12:38:35 +0200
Subject: [PATCH 1/1] mingw-w64 6 fix
diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h
index 1111111..2222222 100644
--- a/src/plugins/common/evr/evrdefs.h
+++ b/src/plugins/common/evr/evrdefs.h
@@ -83,6 +83,7 @@ HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**);
#define MF_E_TRANSFORM_NEED_MORE_INPUT ((HRESULT)0xC00D6D72L)
#endif
+#if __MINGW64_VERSION_MAJOR < 6
#ifdef __GNUC__
typedef struct MFVideoNormalizedRect {
float left;
@@ -91,6 +92,7 @@ typedef struct MFVideoNormalizedRect {
float bottom;
} MFVideoNormalizedRect;
#endif
+#endif
#include <initguid.h>

View File

@ -16,7 +16,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' \
-after \
'LIBS_PRIVATE += -lamstrmid'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef