Skip to content

[ebml, matroska] Updates #6526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 6 commits into from
May 23, 2019
Merged

[ebml, matroska] Updates #6526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36c18d8
[ebml, matroska] Updates
evpobr May 19, 2019
788f854
Fix configuration on Unix platforms
evpobr May 21, 2019
79d92ad
Merge branch 'master' into ebml-and-matroska-update
evpobr May 22, 2019
7762a9d
[matroska] Bump CONTROL version
vicroms May 22, 2019
f778963
[ebml] Export targets to share/EBML to match casing in find_package()
vicroms May 23, 2019
4cc64b1
[matroska] Fix on Linux and MacOS
vicroms May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/ebml/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: ebml
Version: 1.3.7
Version: 1.3.7-1
Description: a C++ libary to parse EBML files
25 changes: 0 additions & 25 deletions ports/ebml/export-endofstreamx.patch
View file
Open in desktop

This file was deleted.

13 changes: 4 additions & 9 deletions ports/ebml/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion ports/matroska/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
12 changes: 4 additions & 8 deletions ports/matroska/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)

Expand All @@ -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)

Expand Down