[vlc-commits] contrib: ebml: fix universal Windows build

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue May 22 16:25:38 2018 +0200| [3c4a90936b9c4163b78db000ce4d115a028d6449] | committer: Jean-Baptiste Kempf

contrib: ebml: fix universal Windows build

(cherry picked from commit 98bdfe4b741707ab43ce8aed02ce08964c17d8b6)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=3c4a90936b9c4163b78db000ce4d115a028d6449
---

 contrib/src/ebml/ebml-fix-univeral-windows.patch | 11 +++++++++++
 contrib/src/ebml/rules.mak                       |  1 +
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/ebml/ebml-fix-univeral-windows.patch b/contrib/src/ebml/ebml-fix-univeral-windows.patch
new file mode 100644
index 0000000000..287e894174
--- /dev/null
+++ b/contrib/src/ebml/ebml-fix-univeral-windows.patch
@@ -0,0 +1,11 @@
+--- ebml/CMakeLists.txt.uwp	2018-05-22 16:23:07.388136700 +0200
++++ ebml/CMakeLists.txt	2018-05-22 16:23:21.243621600 +0200
+@@ -60,7 +60,7 @@ set(libebml_PUBLIC_HEADERS
+   ebml/MemReadIOCallback.h
+   ebml/SafeReadIOCallback.h
+   ebml/StdIOCallback.h)
+-if(WIN32)
++if(WIN32 AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore")
+   list(APPEND libebml_SOURCES
+     src/platform/win32/WinIOCallback.cpp)
+   list(APPEND libebml_PUBLIC_HEADERS
diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index 76102b2f08..7bd24595bf 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -15,6 +15,7 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.xz:
 ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
 	$(UNPACK)
 	$(APPLY) $(SRC)/ebml/0001-fix-build-with-gcc-7.patch
+	$(APPLY) $(SRC)/ebml/ebml-fix-univeral-windows.patch
 	$(MOVE)
 
 # libebml requires exceptions