diff --git a/ports/libsrtp/portfile.cmake b/ports/libsrtp/portfile.cmake index 10d0fe706d..29a04371e6 100644 --- a/ports/libsrtp/portfile.cmake +++ b/ports/libsrtp/portfile.cmake @@ -1,16 +1,9 @@ -vcpkg_download_distfile(CMAKE_PR_PATCH - URLS https://patch-diff.githubusercontent.com/raw/cisco/libsrtp/pull/573.diff - FILENAME libsrtp-pr-573.patch - SHA512 58c07977ccbd3dce114f59583a5e10813bbee907af5ef23ec1961b4cfd0791c14326845a376470430978e878c78fb1f598851898a9e9031225628739fb248176 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cisco/libsrtp - REF v2.4.2 - SHA512 6E4805E6D34B2050A6F68F629B0B42356B1D27F2CBAA6CC6166E56957609C3D9AA6B723DCC674E5C74180D122D27BADD2F9496639CCB1E0C210B9E1F7949D0E2 - PATCHES - ${CMAKE_PR_PATCH} + REF "v${VERSION}" + SHA512 bd679ab65ccf22ca30fe867b9649a0b84cfa6fad6e22eb10f081141632f6dd56479a04d525b865f11fd46007303ca211065d9c170e4820d6ea7055403702340a + PATCHES fix-runtime-destination.patch ) @@ -18,14 +11,13 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + -DTEST_APPS=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup( - CONFIG_PATH lib/cmake/libSRTP -) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libSRTP) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libsrtp" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libsrtp/vcpkg.json b/ports/libsrtp/vcpkg.json index be97d2e985..bcb60dc36f 100644 --- a/ports/libsrtp/vcpkg.json +++ b/ports/libsrtp/vcpkg.json @@ -1,10 +1,9 @@ { "name": "libsrtp", - "version": "2.4.2", - "port-version": 3, + "version": "2.5.0", "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel.", "homepage": "https://github.com/cisco/libsrtp/", - "license": null, + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 4d49588cd6..01c9693220 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4649,8 +4649,8 @@ "port-version": 3 }, "libsrtp": { - "baseline": "2.4.2", - "port-version": 3 + "baseline": "2.5.0", + "port-version": 0 }, "libssh": { "baseline": "0.10.5", diff --git a/versions/l-/libsrtp.json b/versions/l-/libsrtp.json index 8d751f5ffc..5ca8d8ec93 100644 --- a/versions/l-/libsrtp.json +++ b/versions/l-/libsrtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27c325c9851b5c07e172e74e312e8070af7b9d0b", + "version": "2.5.0", + "port-version": 0 + }, { "git-tree": "d66d808ef040f2802ffa00ec6c4728d5603e76f9", "version": "2.4.2",