summarylogtreecommitdiffstats
path: root/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch
blob: d6731d63b772495d524aea893e2940c4b839784a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
From 852a1dd131d9000971455eefb6fa252b0c1226e2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 23 May 2020 15:43:20 +0200
Subject: [PATCH 3/3] Workaround "multiple definition" errors with
 amstrmid/strmiids

---
 src/plugins/directshow/directshow.pro | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 27bb3abb..0cce6f20 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -16,8 +16,11 @@ mingw {
     DEFINES += NO_DSHOW_STRSAFE
 }
 
+# Link against amstrmid for IID_IMFVideoDeviceID, IID_IMFVideoPresenter, IID_IMFTopologyServiceLookupClient
+# and IID_IMFTopologyServiceLookupClient; add -Wl,--allow-multiple-definition to workaround conflicts with
+# strmiids which contains symbols also required but not provided by amstrmid
 mingw {
-    LIBS_PRIVATE += -lamstrmid
+    LIBS_PRIVATE += -Wl,--allow-multiple-definition -lamstrmid
 }
 
 include(common/common.pri)
-- 
2.29.2