[vlc-commits] contrib: ebml: remove UWP patch since we build with 1.3.8+

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jul  6 15:20:15 2020 +0200| [6e9b29ad64c3dadfdc1fc5360f0901a5d52a0037] | committer: Steve Lhomme

contrib: ebml: remove UWP patch since we build with 1.3.8+

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

 contrib/src/ebml/ebml-fix-univeral-windows.patch | 19 -------------------
 contrib/src/ebml/rules.mak                       |  1 -
 2 files changed, 20 deletions(-)

diff --git a/contrib/src/ebml/ebml-fix-univeral-windows.patch b/contrib/src/ebml/ebml-fix-univeral-windows.patch
deleted file mode 100644
index c4c65f3ff5..0000000000
--- a/contrib/src/ebml/ebml-fix-univeral-windows.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ebml/CMakeLists.txt.winio	2019-03-05 13:28:29.477415900 +0100
-+++ ebml/CMakeLists.txt	2019-03-05 13:32:58.566207100 +0100
-@@ -4,6 +4,7 @@ project(ebml VERSION 1.3.6)
- 
- option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF)
- option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF)
-+option(ENABLE_WIN32_IO "Build the Windows I/O helper class" OFF)
- 
- include(GNUInstallDirs)
- 
-@@ -60,7 +61,7 @@ set(libebml_PUBLIC_HEADERS
-   ebml/MemReadIOCallback.h
-   ebml/SafeReadIOCallback.h
-   ebml/StdIOCallback.h)
--if(WIN32)
-+if(WIN32 AND ENABLE_WIN32_IO)
-   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 1215552181..5859439e75 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -14,7 +14,6 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.xz:
 
 ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
 	$(UNPACK)
-	$(APPLY) $(SRC)/ebml/ebml-fix-univeral-windows.patch
 	$(MOVE)
 
 # libebml requires exceptions