diff options
| author | evpobr <evpobr@gmail.com> | 2019-05-23 23:27:54 +0500 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-05-23 11:27:54 -0700 |
| commit | 25d80a74d67fac97226ecf2a7edea644bdebd97a (patch) | |
| tree | 3acf58b0c0ffe39327af48ffaefca89283d95170 /ports/matroska | |
| parent | 17623739df4796353d5eb4c9a2ec513c679022e0 (diff) | |
| download | vcpkg-25d80a74d67fac97226ecf2a7edea644bdebd97a.tar.gz vcpkg-25d80a74d67fac97226ecf2a7edea644bdebd97a.zip | |
[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
Diffstat (limited to 'ports/matroska')
| -rw-r--r-- | ports/matroska/CONTROL | 2 | ||||
| -rw-r--r-- | ports/matroska/portfile.cmake | 12 |
2 files changed, 5 insertions, 9 deletions
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) |