diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-09-28 06:00:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 21:00:19 -0700 |
| commit | 0fc5f349d295a11dbd27b1180e7b90fd1d1f4ffe (patch) | |
| tree | 2b6517193abb03d9e02a01abc24b439dbad9c6cf | |
| parent | 980a91e3b7932d02e8d88bf70d06d2bfe43fcd05 (diff) | |
| download | vcpkg-0fc5f349d295a11dbd27b1180e7b90fd1d1f4ffe.tar.gz vcpkg-0fc5f349d295a11dbd27b1180e7b90fd1d1f4ffe.zip | |
[libsrtp] Update to 2.4.2 (#20359)
* Update libsrtp to 2.4.2
* Update CI baseline
* More tweaks
* Update git-tree hash
Co-authored-by: chausner <chausner@users.noreply.github.com>
| -rw-r--r-- | ports/libsrtp/portfile.cmake | 26 | ||||
| -rw-r--r-- | ports/libsrtp/vcpkg.json | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/l-/libsrtp.json | 5 |
4 files changed, 21 insertions, 17 deletions
diff --git a/ports/libsrtp/portfile.cmake b/ports/libsrtp/portfile.cmake index 88a13b885..2a1b5bea6 100644 --- a/ports/libsrtp/portfile.cmake +++ b/ports/libsrtp/portfile.cmake @@ -1,31 +1,31 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cisco/libsrtp
- REF 56a065555aea2abddaf9fb60353fe59f277837a3
- SHA512 59afa25df79f875d28eefe95ef89b5956b1d2f319bba38ec34b832c2faa16b5425aae2f6ad19cf478afe02b28f4032b5dcf20a301d647d897d4577f66ca77376
+ REF v2.4.2
+ SHA512 6E4805E6D34B2050A6F68F629B0B42356B1D27F2CBAA6CC6166E56957609C3D9AA6B723DCC674E5C74180D122D27BADD2F9496639CCB1E0C210B9E1F7949D0E2
)
if (VCPKG_TARGET_IS_WINDOWS)
- set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd4703")
- set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd4703")
+ set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /wd4703")
+ set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /wd4703")
endif()
vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
+ SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
)
vcpkg_install_cmake()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/srtp2.dll)
- file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
- file(RENAME ${CURRENT_PACKAGES_DIR}/lib/srtp2.dll ${CURRENT_PACKAGES_DIR}/bin/srtp2.dll)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/srtp2.dll")
+ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
+ file(RENAME "${CURRENT_PACKAGES_DIR}/lib/srtp2.dll" "${CURRENT_PACKAGES_DIR}/bin/srtp2.dll")
endif()
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/srtp2.dll)
- file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/srtp2.dll ${CURRENT_PACKAGES_DIR}/debug/bin/srtp2.dll)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/srtp2.dll")
+ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
+ file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/srtp2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/srtp2.dll")
endif()
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsrtp RENAME copyright)
\ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libsrtp" RENAME copyright)
diff --git a/ports/libsrtp/vcpkg.json b/ports/libsrtp/vcpkg.json index fd0d3db3d..234d7faf1 100644 --- a/ports/libsrtp/vcpkg.json +++ b/ports/libsrtp/vcpkg.json @@ -1,6 +1,5 @@ { "name": "libsrtp", - "version-string": "2.2.0", - "port-version": 1, + "version": "2.4.2", "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel." } diff --git a/versions/baseline.json b/versions/baseline.json index b177ccc98..2528e86d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3797,8 +3797,8 @@ "port-version": 1 }, "libsrtp": { - "baseline": "2.2.0", - "port-version": 1 + "baseline": "2.4.2", + "port-version": 0 }, "libssh": { "baseline": "0.9.6", diff --git a/versions/l-/libsrtp.json b/versions/l-/libsrtp.json index 4eab78d14..eafc5bb2b 100644 --- a/versions/l-/libsrtp.json +++ b/versions/l-/libsrtp.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "20d89602c93b0aa1df176a8610b514b014375c8c", + "version": "2.4.2", + "port-version": 0 + }, + { "git-tree": "fdf039be54c0a11434b8c923e808d6315b398082", "version-string": "2.2.0", "port-version": 1 |