[ebml, matroska] Updates (#6526)

* [ebml, matroska] Updates

* ebml: use standard CMake project
* ebml: no patches needed (merged in upstream)
* matroska: update to 1.5.0
* matroska: use standard CMake project

Breaking changes from upstream:

* ebml target is now in EBML:: namespace
* matroska target is now in Matroska:: namespace

* Fix configuration on Unix platforms

* [matroska] Bump CONTROL version

* [ebml] Export targets to share/EBML to match casing in find_package()

* [matroska] Fix on Linux and MacOS

5 files changed, 10 insertions, 44 deletions

diff --git a/ports/ebml/CONTROL b/ports/ebml/CONTROL
index ee257603f..9eb3ad9a4 100644
--- a/ports/ebml/CONTROL
+++ b/ports/ebml/CONTROL
@@ -1,3 +1,3 @@
 Source: ebml

-Version: 1.3.7

+Version: 1.3.7-1

 Description: a C++ libary to parse EBML files

diff --git a/ports/ebml/export-endofstreamx.patch b/ports/ebml/export-endofstreamx.patch
deleted file mode 100644
index f89035230..000000000
--- a/ports/ebml/export-endofstreamx.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d880a71996ba50c18d2e2d33ce4018b22566d9f4 Mon Sep 17 00:00:00 2001
-From: evpobr <evpobr@gmail.com>
-Date: Sat, 17 Feb 2018 12:39:27 +0500
-Subject: [PATCH] Export SafeReadIOCallback::EndOfStreamX class from DLL
-
----
- ebml/SafeReadIOCallback.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ebml/SafeReadIOCallback.h b/ebml/SafeReadIOCallback.h
-index ea96727..3d9de07 100644
---- a/ebml/SafeReadIOCallback.h
-+++ b/ebml/SafeReadIOCallback.h
-@@ -45,7 +45,7 @@ class EBML_DLL_API EbmlBinary;
- 
- class EBML_DLL_API SafeReadIOCallback {
- public:
--  class EndOfStreamX {
-+  class EBML_DLL_API EndOfStreamX {
-   public:
-     size_t mMissingBytes;
-     EndOfStreamX(std::size_t MissingBytes);
--- 
-2.15.1.windows.2
-
diff --git a/ports/ebml/portfile.cmake b/ports/ebml/portfile.cmake
index 3eb8d642d..0c6934dbc 100644
--- a/ports/ebml/portfile.cmake
+++ b/ports/ebml/portfile.cmake
@@ -1,16 +1,15 @@
 include(vcpkg_common_functions)

 

 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

-    message(FATAL_ERROR "${PORT} does not currently support UWP")

+    message(FATAL_ERROR "ebml does not currently support UWP")

 endif()

 

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO Matroska-Org/libebml

-    REF release-1.3.7

-    SHA512 754dee128db2eb6f0ba09962312ddda79f3178238464dd6161cce50bd08fd4193490a48bb537c4e2a388dc339951909a8857617cb30500d76d5689da4f855b47

+    REF 20e9d85e5d18fa262c95202751fbba824fe43f19

+    SHA512 d0352921f8e6546343da0c74727662b41d36f2b62f8ab79da0e86c9eb916984f9bb43c4a78459593b56bec4d9a8f4950754b1132b9b489cc9cef85dcfb4f6890

     HEAD_REF master

-    PATCHES export-endofstreamx.patch

 )

 

 vcpkg_configure_cmake(

@@ -21,11 +20,7 @@ vcpkg_configure_cmake(
 

 vcpkg_install_cmake()

 

-if (WIN32)

-    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)

-else ()

-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ebml)

-endif ()

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EBML)

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 

diff --git a/ports/matroska/CONTROL b/ports/matroska/CONTROL
index 6dfc8dbf0..6df74d070 100644
--- a/ports/matroska/CONTROL
+++ b/ports/matroska/CONTROL
@@ -1,4 +1,4 @@
 Source: matroska
-Version: 1.5.0
+Version: 1.5.0-51648bb
 Description: a C++ libary to parse Matroska files (.mkv and .mka)
 Build-Depends: ebml
diff --git a/ports/matroska/portfile.cmake b/ports/matroska/portfile.cmake
index 3127d9597..de64bcb24 100644
--- a/ports/matroska/portfile.cmake
+++ b/ports/matroska/portfile.cmake
@@ -1,14 +1,14 @@
 include(vcpkg_common_functions)
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
+    message(FATAL_ERROR "matroska does not currently support UWP")
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Matroska-Org/libmatroska
-    REF release-1.5.0
-    SHA512 956cee9cc6f752f7328ef6837dbbf342a5001bf5467b1dd5ac6ececf777c497b9d97b83a872b6bdff9927d2c464b1c22dc32803d7124f009c83e445d10dacc55
+    REF 51648bb73e4f6a81be754c9a271fc681a1c78f7a
+    SHA512 f0369680dfc071837230ff409659c243563d341ebda55b475eee749e8abf305d149c8f8db5d649e87edf03d9c2b186ba8d452ec996eff402e5d1812e01ff32ae
     HEAD_REF master
 )
 
@@ -20,11 +20,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-if (WIN32)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
-else ()
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/matroska)
-endif ()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Matroska)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)