diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-10-06 01:13:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 16:13:59 -0700 |
| commit | fab7bbf0c050b08d34c0c63d300de10ad81ee996 (patch) | |
| tree | 4b31e416de8d4121e4b5f8418e4e515471846069 | |
| parent | 8f236ca74d7ae223589deef77304a45ada9fa30d (diff) | |
| download | vcpkg-fab7bbf0c050b08d34c0c63d300de10ad81ee996.tar.gz vcpkg-fab7bbf0c050b08d34c0c63d300de10ad81ee996.zip | |
[ebml] Update to 1.4.2 (#20491)
* Update ebml to 1.4.2
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/ebml/portfile.cmake | 17 | ||||
| -rw-r--r-- | ports/ebml/vcpkg.json | 17 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/e-/ebml.json | 5 |
4 files changed, 28 insertions, 15 deletions
diff --git a/ports/ebml/portfile.cmake b/ports/ebml/portfile.cmake index 944dcb00c..2a4d232ae 100644 --- a/ports/ebml/portfile.cmake +++ b/ports/ebml/portfile.cmake @@ -5,22 +5,21 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Matroska-Org/libebml - REF 6145c5700d894312c4dd47ba6c1ace72075b0692 # release-1.4.0 - SHA512 74132d4605ec8b75e72fa58ca4c04c5aa980aae4b028032d34fde14eff406c814518168ae7bfec5cdaf026d914a019b1fcac1458c40537c4964a46989c1283d0 + REF release-1.4.2 + SHA512 2A03CA1D82A41EE05CFE4DD2726CC79295FA06A4D8ECEB93FE8F41BDFF09F04897B434B49DD1F496E1C014289B14C3F3416EAB4C8B1E745652FF1AB4A620BF83 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DDISABLE_PKGCONFIG=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EBML) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EBML) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ebml/vcpkg.json b/ports/ebml/vcpkg.json index 764a42e79..f90e93d79 100644 --- a/ports/ebml/vcpkg.json +++ b/ports/ebml/vcpkg.json @@ -1,8 +1,17 @@ { "name": "ebml", - "version-string": "1.4.0", - "port-version": 1, - "description": "a C++ library to parse EBML files", + "version": "1.4.2", + "description": "A C++ library to parse EBML files", "homepage": "https://github.com/Matroska-Org/libebml", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a3a44f2f8..ce1092dde 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1925,8 +1925,8 @@ "port-version": 2 }, "ebml": { - "baseline": "1.4.0", - "port-version": 1 + "baseline": "1.4.2", + "port-version": 0 }, "ecm": { "baseline": "5.84.0", diff --git a/versions/e-/ebml.json b/versions/e-/ebml.json index 9a4a7e43a..3d935cba3 100644 --- a/versions/e-/ebml.json +++ b/versions/e-/ebml.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "ba8376ad269930aee17a0890ccbd267639122616", + "version": "1.4.2", + "port-version": 0 + }, + { "git-tree": "92e5e7a92a8bd6a496911ea44a032088e776471f", "version-string": "1.4.0", "port-version": 1 |