diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/ebml | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/ebml')
| -rw-r--r-- | ports/ebml/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ebml/export-endofstreamx.patch | 25 | ||||
| -rw-r--r-- | ports/ebml/portfile.cmake | 13 |
3 files changed, 5 insertions, 35 deletions
diff --git a/ports/ebml/CONTROL b/ports/ebml/CONTROL index ee257603f..0d1f5e97c 100644 --- a/ports/ebml/CONTROL +++ b/ports/ebml/CONTROL @@ -1,3 +1,3 @@ Source: ebml
-Version: 1.3.7
+Version: 1.3.9
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..f4817db1a 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 release-1.3.9
+ SHA512 3ae22ed491024b276edde9237df0e41a8e5a4e142ec6783c77d5286d7825fb59be62f336d07f7042baac8fc7ac004ad7cc4605754c5801d65547449ea04c287f
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)
|