[vlc-devel] [PATCH 08/12] contrib: remove dllimport from ANGLE EGL api

[Pierre Lamot]

  Angle is linked statically
---
 ...llimport-from-ANGLE-egl-entry-points.patch | 26 +++++++++++++++++++
 contrib/src/qt/rules.mak                      |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 contrib/src/qt/0009-remove-dllimport-from-ANGLE-egl-entry-points.patch

diff --git a/contrib/src/qt/0009-remove-dllimport-from-ANGLE-egl-entry-points.patch b/contrib/src/qt/0009-remove-dllimport-from-ANGLE-egl-entry-points.patch
new file mode 100644
index 0000000000..cea7c2776b
--- /dev/null
+++ b/contrib/src/qt/0009-remove-dllimport-from-ANGLE-egl-entry-points.patch
@@ -0,0 +1,26 @@
+From d98b08718ada1f3658db4173531de3c124b85013 Mon Sep 17 00:00:00 2001
+From: Pierre Lamot <pierre at videolabs.io>
+Date: Wed, 6 May 2020 18:10:16 +0200
+Subject: [PATCH] remove dllimport from ANGLE egl entry points
+
+  ANGLE library is statically linked
+---
+ src/3rdparty/angle/include/KHR/khrplatform.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/angle/include/KHR/khrplatform.h b/src/3rdparty/angle/include/KHR/khrplatform.h
+index 68fca48..add4855 100644
+--- a/src/3rdparty/angle/include/KHR/khrplatform.h
++++ b/src/3rdparty/angle/include/KHR/khrplatform.h
+@@ -98,7 +98,7 @@
+  * This precedes the return type of the function in the function prototype.
+  */
+ #if defined(_WIN32) && !defined(__SCITECH_SNAP__)
+-#   define KHRONOS_APICALL __declspec(dllimport)
++#   define KHRONOS_APICALL
+ #elif defined (__SYMBIAN32__)
+ #   define KHRONOS_APICALL IMPORT_C
+ #elif defined(__ANDROID__)
+-- 
+2.25.1
+
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 72d60ca6f1..d1fa1eb4dd 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -37,6 +37,7 @@ endif
 	$(APPLY) $(SRC)/qt/0006-ANGLE-don-t-use-msvc-intrinsics-when-crosscompiling-.patch
 	$(APPLY) $(SRC)/qt/0007-ANGLE-remove-static-assert-that-can-t-be-evaluated-b.patch
 	$(APPLY) $(SRC)/qt/0008-ANGLE-disable-ANGLE_STD_ASYNC_WORKERS-when-compiling.patch
+	$(APPLY) $(SRC)/qt/0009-remove-dllimport-from-ANGLE-egl-entry-points.patch
 	$(APPLY) $(SRC)/qt/fix-mingw-pkgconfig-file-and-dependency-naming.patch
 
 ifdef HAVE_CROSS_COMPILE
-- 
2.25.1