From 66f09a0b609e0a118902ca603d51172eb788fff9 Mon Sep 17 00:00:00 2001 From: Cheney-Wang Date: Tue, 28 Aug 2018 00:43:56 -0700 Subject: [Live555] Update to latest --- ports/live555/CONTROL | 2 +- ports/live555/portfile.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 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..50cc6e866 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -4,14 +4,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() # The current Live555 version from http://www.live555.com/liveMedia/public/ -set(LIVE_VERSION 2018.08.05) -set(LIVE_SHA 2d7de75d91567a7a8a8982ea414f4bf403cb3d3efcc5183c2b55c5ac6b7b18f8f93f50c4fe762078c6e799b66835d5436be99f32db8becb735507ccf559c544e) +set(LIVE_VERSION latest) +set(LIVE_SHA 225f27c8e188d41d8b81dc6d27c918cbbb0399330362683600ed02cc8f50e7dac10e6a9e0cf6c23a0153c750ddf1f20213922c426507f40a5e63950d46683fd5) 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" + URLS "http://www.live555.com/liveMedia/public/live555-${LIVE_VERSION}.tar.gz" + FILENAME "live555-${LIVE_VERSION}.tar.gz" SHA512 ${LIVE_SHA} ) vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}) -- cgit v1.2.3 From cfbd6d93d47fe288bdb19fa600047378346be868 Mon Sep 17 00:00:00 2001 From: Cheney-Wang Date: Wed, 29 Aug 2018 00:03:55 -0700 Subject: [live555] update live555 --- ports/live555/portfile.cmake | 71 ++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index 50cc6e866..4b173867f 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 latest) -set(LIVE_SHA 225f27c8e188d41d8b81dc6d27c918cbbb0399330362683600ed02cc8f50e7dac10e6a9e0cf6c23a0153c750ddf1f20213922c426507f40a5e63950d46683fd5) - -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" - 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 "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() + -- cgit v1.2.3 From a6cff2bd57b204a84ddf0c9c50b9367e3e0819bb Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Wed, 29 Aug 2018 16:43:10 -0700 Subject: [live555] Improve error message --- ports/live555/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index 4b173867f..55d15a88c 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -4,12 +4,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() if(NOT VCPKG_USE_HEAD_VERSION) - message(FATAL_ERROR "Please re-run the installation with --head.") -else() + 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) + 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" -- cgit v1.2.3