diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-08-29 17:01:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 17:01:23 -0700 |
| commit | 1f290f4b8cd54808f60ff2c0db07bd3809c56cb2 (patch) | |
| tree | eea4a5c9e6ff9a4cfef6c6472b7b979b29870548 | |
| parent | d91d55a3c31d6364cb8a50e44c50315ac73aed85 (diff) | |
| parent | a6cff2bd57b204a84ddf0c9c50b9367e3e0819bb (diff) | |
| download | vcpkg-1f290f4b8cd54808f60ff2c0db07bd3809c56cb2.tar.gz vcpkg-1f290f4b8cd54808f60ff2c0db07bd3809c56cb2.zip | |
Merge pull request #4176 from Cheney-W/Live555Update
[Live555] Update to latest
| -rw-r--r-- | ports/live555/CONTROL | 2 | ||||
| -rw-r--r-- | ports/live555/portfile.cmake | 71 |
2 files changed, 39 insertions, 34 deletions
diff --git a/ports/live555/CONTROL b/ports/live555/CONTROL index 0fca99675..39c8e4a65 100644 --- a/ports/live555/CONTROL +++ b/ports/live555/CONTROL @@ -1,3 +1,3 @@ Source: live555 -Version: 2018.08.05 +Version: latest Description: A complete RTSP server application diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index 74d5b8309..55d15a88c 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -3,36 +3,41 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(VCPKG_LIBRARY_LINKAGE "static") endif() -# The current Live555 version from http://www.live555.com/liveMedia/public/ -set(LIVE_VERSION 2018.08.05) -set(LIVE_SHA 2d7de75d91567a7a8a8982ea414f4bf403cb3d3efcc5183c2b55c5ac6b7b18f8f93f50c4fe762078c6e799b66835d5436be99f32db8becb735507ccf559c544e) - -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}/live) -vcpkg_download_distfile(ARCHIVE - URLS "http://www.live555.com/liveMedia/public/live.${LIVE_VERSION}.tar.gz" - FILENAME "live.${LIVE_VERSION}.tar.gz" - SHA512 ${LIVE_SHA} -) -vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) - -vcpkg_install_cmake() - -file(GLOB HEADERS - "${SOURCE_PATH}/BasicUsageEnvironment/include/*.h*" - "${SOURCE_PATH}/groupsock/include/*.h*" - "${SOURCE_PATH}/liveMedia/include/*.h*" - "${SOURCE_PATH}/UsageEnvironment/include/*.h*" -) - -file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/live555 RENAME copyright) - -vcpkg_copy_pdbs() +if(NOT VCPKG_USE_HEAD_VERSION) + message(FATAL_ERROR "Live555 does not have persistent releases. Please re-run the installation with --head.") +else() + # The current Live555 version from http://www.live555.com/liveMedia/public/ + set(LIVE_VERSION latest) + + include(vcpkg_common_functions) + set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}/live) + vcpkg_download_distfile(ARCHIVE + URLS "http://www.live555.com/liveMedia/public/live555-${LIVE_VERSION}.tar.gz" + FILENAME "live555-${LIVE_VERSION}.tar.gz" + SKIP_SHA512 + ) + + vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}) + + file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + ) + + vcpkg_install_cmake() + + file(GLOB HEADERS + "${SOURCE_PATH}/BasicUsageEnvironment/include/*.h*" + "${SOURCE_PATH}/groupsock/include/*.h*" + "${SOURCE_PATH}/liveMedia/include/*.h*" + "${SOURCE_PATH}/UsageEnvironment/include/*.h*" + ) + + file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/live555 RENAME copyright) + + vcpkg_copy_pdbs() +endif() + |