[live555] Update and simplify

12 files changed, 49 insertions, 645 deletions

diff --git a/ports/live555/BasicUsageEnvironment.txt b/ports/live555/BasicUsageEnvironment.txt
deleted file mode 100644
index 40d311ee0..000000000
--- a/ports/live555/BasicUsageEnvironment.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# CMakeLists.txt in BasicUsageEnvironment
-
-SET(BASIC_USAGE_ENVIRONMENT_SRCS 
-BasicHashTable.cpp
-BasicTaskScheduler.cpp
-BasicTaskScheduler0.cpp
-BasicUsageEnvironment.cpp
-BasicUsageEnvironment0.cpp
-DelayQueue.cpp
-)
-
-SET(BASIC_USAGE_ENVIRONMENT_HEADERS
-include/BasicHashTable.hh
-include/BasicUsageEnvironment.hh
-include/BasicUsageEnvironment0.hh
-include/BasicUsageEnvironment_version.hh
-include/DelayQueue.hh
-include/HandlerSet.hh
-)
-
-INCLUDE_DIRECTORIES(
-${live555Includes}
-)
-
-ADD_LIBRARY( BasicUsageEnvironment STATIC ${BASIC_USAGE_ENVIRONMENT_HEADERS} ${BASIC_USAGE_ENVIRONMENT_SRCS})
diff --git a/ports/live555/CMakeLists.txt b/ports/live555/CMakeLists.txt
new file mode 100644
index 000000000..a41d2c791
--- /dev/null
+++ b/ports/live555/CMakeLists.txt
@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.5)
+project(live555 CXX)
+
+include_directories(
+    BasicUsageEnvironment/include
+    groupsock/include
+    liveMedia/include
+    UsageEnvironment/include
+)
+
+file(GLOB BASIC_USAGE_ENVIRONMENT_SRCS BasicUsageEnvironment/*.cpp)
+add_library(BasicUsageEnvironment ${BASIC_USAGE_ENVIRONMENT_SRCS})
+
+file(GLOB GROUPSOCK_SRCS groupsock/*.cpp)
+add_library(groupsock ${GROUPSOCK_SRCS})
+
+file(GLOB LIVEMEDIA_SRCS liveMedia/*.cpp)
+add_library(liveMedia ${LIVEMEDIA_SRCS})
+
+file(GLOB USAGE_ENVIRONMENT_SRCS UsageEnvironment/*.cpp)
+add_library(UsageEnvironment ${LIVEMEDIA_SRCS})
+
+install(TARGETS groupsock BasicUsageEnvironment liveMedia UsageEnvironment
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+)
diff --git a/ports/live555/CONTROL b/ports/live555/CONTROL
index 3c3318c2c..4197a3595 100644
--- a/ports/live555/CONTROL
+++ b/ports/live555/CONTROL
@@ -1,3 +1,3 @@
 Source: live555
-Version: 2018.01.29
+Version: 2018.02.18
 Description: A complete RTSP server application
diff --git a/ports/live555/UsageEnvironment.txt b/ports/live555/UsageEnvironment.txt
deleted file mode 100644
index 0e93ec145..000000000
--- a/ports/live555/UsageEnvironment.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# CMakeLists.txt in UsageEnvironment
-
-SET(USAGE_ENVIRONMENT_SRCS
-HashTable.cpp
-strDup.cpp
-UsageEnvironment.cpp
-)
-
-SET(USAGE_ENVIRONMENT_HEADERS
-include/Boolean.hh
-include/HashTable.hh
-include/strDup.hh
-include/UsageEnvironment.hh
-include/UsageEnvironment_version.hh
-)
-
-INCLUDE_DIRECTORIES(
-${live555Includes}
-)
-
-ADD_LIBRARY( UsageEnvironment STATIC ${USAGE_ENVIRONMENT_HEADERS} ${USAGE_ENVIRONMENT_SRCS})
diff --git a/ports/live555/groupsock.txt b/ports/live555/groupsock.txt
deleted file mode 100644
index c8c795ffa..000000000
--- a/ports/live555/groupsock.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# CMakeLists.txt in groupsock
-
-SET(GROUPSOCK_SRCS
-GroupEId.cpp
-Groupsock.cpp
-GroupsockHelper.cpp
-inet.c
-IOHandlers.cpp
-NetAddress.cpp
-NetInterface.cpp
-)
-
-SET(GROUPSOCK_HEADERS
-include/GroupEId.hh
-include/Groupsock.hh
-include/GroupsockHelper.hh
-include/groupsock_version.hh
-include/IOHandlers.hh
-include/NetAddress.hh
-include/NetInterface.hh
-include/TunnelEncaps.hh
-)
-
-INCLUDE_DIRECTORIES(
-${live555Includes}
-)
-
-ADD_LIBRARY( groupsock STATIC ${GROUPSOCK_HEADERS} ${GROUPSOCK_SRCS})
diff --git a/ports/live555/live.txt b/ports/live555/live.txt
deleted file mode 100644
index 1bb168407..000000000
--- a/ports/live555/live.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# CMakeLists.txt in live
-
-# includes
-INCLUDE_DIRECTORIES(
-${live555Includes}
-)
-
-ADD_SUBDIRECTORY(BasicUsageEnvironment)
-ADD_SUBDIRECTORY(groupsock)
-ADD_SUBDIRECTORY(liveMedia)
-#ADD_SUBDIRECTORY(mediaServer)
-#ADD_SUBDIRECTORY(proxyServer)
-ADD_SUBDIRECTORY(UsageEnvironment)
-#ADD_SUBDIRECTORY(testProgs)
diff --git a/ports/live555/liveMedia.txt b/ports/live555/liveMedia.txt
deleted file mode 100644
index 604bf1c50..000000000
--- a/ports/live555/liveMedia.txt
+++ /dev/null
@@ -1,333 +0,0 @@
-# CMakeLists.txt in liveMedia
-
-SET(LIVE_MEDIA_SRCS
-AC3AudioFileServerMediaSubsession.cpp
-AC3AudioRTPSink.cpp
-AC3AudioRTPSource.cpp
-AC3AudioStreamFramer.cpp
-ADTSAudioFileServerMediaSubsession.cpp
-ADTSAudioFileSource.cpp
-AMRAudioFileServerMediaSubsession.cpp
-AMRAudioFileSink.cpp
-AMRAudioFileSource.cpp
-AMRAudioRTPSink.cpp
-AMRAudioRTPSource.cpp
-AMRAudioSource.cpp
-AudioInputDevice.cpp
-AudioRTPSink.cpp
-AVIFileSink.cpp
-Base64.cpp
-BasicUDPSink.cpp
-BasicUDPSource.cpp
-BitVector.cpp
-ByteStreamFileSource.cpp
-ByteStreamMemoryBufferSource.cpp
-ByteStreamMultiFileSource.cpp
-#DarwinInjector.cpp
-DeviceSource.cpp
-DigestAuthentication.cpp
-DVVideoFileServerMediaSubsession.cpp
-DVVideoRTPSink.cpp
-DVVideoRTPSource.cpp
-DVVideoStreamFramer.cpp
-EBMLNumber.cpp
-FileServerMediaSubsession.cpp
-FileSink.cpp
-FramedFileSource.cpp
-FramedFilter.cpp
-FramedSource.cpp
-GenericMediaServer.cpp
-GSMAudioRTPSink.cpp
-H261VideoRTPSource.cpp
-H263plusVideoFileServerMediaSubsession.cpp
-H263plusVideoRTPSink.cpp
-H263plusVideoRTPSource.cpp
-H263plusVideoStreamFramer.cpp
-H263plusVideoStreamParser.cpp
-H264or5VideoFileSink.cpp
-H264or5VideoRTPSink.cpp
-H264or5VideoStreamDiscreteFramer.cpp
-H264or5VideoStreamFramer.cpp
-H264VideoFileServerMediaSubsession.cpp
-H264VideoFileSink.cpp
-H264VideoRTPSink.cpp
-H264VideoRTPSource.cpp
-H264VideoStreamDiscreteFramer.cpp
-H264VideoStreamFramer.cpp
-H265VideoFileServerMediaSubsession.cpp
-H265VideoFileSink.cpp
-H265VideoRTPSink.cpp
-H265VideoRTPSource.cpp
-H265VideoStreamDiscreteFramer.cpp
-H265VideoStreamFramer.cpp
-InputFile.cpp
-JPEGVideoRTPSink.cpp
-JPEGVideoRTPSource.cpp
-JPEGVideoSource.cpp
-Locale.cpp
-MatroskaDemuxedTrack.cpp
-MatroskaFile.cpp
-MatroskaFileParser.cpp
-MatroskaFileServerDemux.cpp
-MatroskaFileServerMediaSubsession.cpp
-Media.cpp
-MediaSession.cpp
-MediaSink.cpp
-MediaSource.cpp
-MP3ADU.cpp
-MP3ADUdescriptor.cpp
-MP3ADUinterleaving.cpp
-MP3ADURTPSink.cpp
-MP3ADURTPSource.cpp
-MP3ADUTranscoder.cpp
-MP3AudioFileServerMediaSubsession.cpp
-MP3AudioMatroskaFileServerMediaSubsession.cpp
-MP3FileSource.cpp
-MP3Internals.cpp
-MP3InternalsHuffman.cpp
-MP3InternalsHuffmanTable.cpp
-MP3StreamState.cpp
-MP3Transcoder.cpp
-MPEG1or2AudioRTPSink.cpp
-MPEG1or2AudioRTPSource.cpp
-MPEG1or2AudioStreamFramer.cpp
-MPEG1or2Demux.cpp
-MPEG1or2DemuxedElementaryStream.cpp
-MPEG1or2DemuxedServerMediaSubsession.cpp
-MPEG1or2FileServerDemux.cpp
-MPEG1or2VideoFileServerMediaSubsession.cpp
-MPEG1or2VideoRTPSink.cpp
-MPEG1or2VideoRTPSource.cpp
-MPEG1or2VideoStreamDiscreteFramer.cpp
-MPEG1or2VideoStreamFramer.cpp
-MPEG2IndexFromTransportStream.cpp
-MPEG2TransportFileServerMediaSubsession.cpp
-MPEG2TransportStreamAccumulator.cpp
-MPEG2TransportStreamFramer.cpp
-MPEG2TransportStreamFromESSource.cpp
-MPEG2TransportStreamFromPESSource.cpp
-MPEG2TransportStreamIndexFile.cpp
-MPEG2TransportStreamMultiplexor.cpp
-MPEG2TransportStreamTrickModeFilter.cpp
-MPEG2TransportUDPServerMediaSubsession.cpp
-MPEG4ESVideoRTPSink.cpp
-MPEG4ESVideoRTPSource.cpp
-MPEG4GenericRTPSink.cpp
-MPEG4GenericRTPSource.cpp
-MPEG4LATMAudioRTPSink.cpp
-MPEG4LATMAudioRTPSource.cpp
-MPEG4VideoFileServerMediaSubsession.cpp
-MPEG4VideoStreamDiscreteFramer.cpp
-MPEG4VideoStreamFramer.cpp
-MPEGVideoStreamFramer.cpp
-MPEGVideoStreamParser.cpp
-MultiFramedRTPSink.cpp
-MultiFramedRTPSource.cpp
-OggDemuxedTrack.cpp
-OggFile.cpp
-OggFileParser.cpp
-OggFileServerDemux.cpp
-OggFileServerMediaSubsession.cpp
-OggFileSink.cpp
-OnDemandServerMediaSubsession.cpp
-ourMD5.cpp
-OutputFile.cpp
-PassiveServerMediaSubsession.cpp
-ProxyServerMediaSession.cpp
-QCELPAudioRTPSource.cpp
-QuickTimeFileSink.cpp
-QuickTimeGenericRTPSource.cpp
-RTCP.cpp
-rtcp_from_spec.c
-RTPInterface.cpp
-RTPSink.cpp
-RTPSource.cpp
-RTSPClient.cpp
-RTSPCommon.cpp
-RTSPRegisterSender.cpp
-RTSPServer.cpp
-RTSPServerRegister.cpp
-RTSPServerSupportingHTTPStreaming.cpp
-ServerMediaSession.cpp
-SimpleRTPSink.cpp
-SimpleRTPSource.cpp
-SIPClient.cpp
-StreamParser.cpp
-StreamReplicator.cpp
-T140TextRTPSink.cpp
-TCPStreamSink.cpp
-TextRTPSink.cpp
-TheoraVideoRTPSink.cpp
-TheoraVideoRTPSource.cpp
-uLawAudioFilter.cpp
-VideoRTPSink.cpp
-VorbisAudioRTPSink.cpp
-VorbisAudioRTPSource.cpp
-VP8VideoRTPSink.cpp
-VP8VideoRTPSource.cpp
-VP9VideoRTPSink.cpp
-VP9VideoRTPSource.cpp
-WAVAudioFileServerMediaSubsession.cpp
-WAVAudioFileSource.cpp
-)
-
-SET(LIVE_MEDIA_HEADERS
-include/AC3AudioFileServerMediaSubsession.hh
-include/AC3AudioRTPSink.hh
-include/AC3AudioRTPSource.hh
-include/AC3AudioStreamFramer.hh
-include/ADTSAudioFileServerMediaSubsession.hh
-include/ADTSAudioFileSource.hh
-include/AMRAudioFileServerMediaSubsession.hh
-include/AMRAudioFileSink.hh
-include/AMRAudioFileSource.hh
-include/AMRAudioRTPSink.hh
-include/AMRAudioRTPSource.hh
-include/AMRAudioSource.hh
-include/AudioInputDevice.hh
-include/AudioRTPSink.hh
-include/AVIFileSink.hh
-include/Base64.hh
-include/BasicUDPSink.hh
-include/BasicUDPSource.hh
-include/BitVector.hh
-include/ByteStreamFileSource.hh
-include/ByteStreamMemoryBufferSource.hh
-include/ByteStreamMultiFileSource.hh
-#include/DarwinInjector.hh
-include/DeviceSource.hh
-include/DigestAuthentication.hh
-include/DVVideoFileServerMediaSubsession.hh
-include/DVVideoRTPSink.hh
-include/DVVideoRTPSource.hh
-include/DVVideoStreamFramer.hh
-include/FileServerMediaSubsession.hh
-include/FileSink.hh
-include/FramedFileSource.hh
-include/FramedFilter.hh
-include/FramedSource.hh
-include/GenericMediaServer.hh
-include/GSMAudioRTPSink.hh
-include/H261VideoRTPSource.hh
-include/H263plusVideoFileServerMediaSubsession.hh
-include/H263plusVideoRTPSink.hh
-include/H263plusVideoRTPSource.hh
-include/H263plusVideoStreamFramer.hh
-include/H264or5VideoFileSink.hh
-include/H264or5VideoRTPSink.hh
-include/H264or5VideoStreamDiscreteFramer.hh
-include/H264or5VideoStreamFramer.hh
-include/H264VideoFileServerMediaSubsession.hh
-include/H264VideoFileSink.hh
-include/H264VideoRTPSink.hh
-include/H264VideoRTPSource.hh
-include/H264VideoStreamDiscreteFramer.hh
-include/H264VideoStreamFramer.hh
-include/H265VideoFileServerMediaSubsession.hh
-include/H265VideoFileSink.hh
-include/H265VideoRTPSink.hh
-include/H265VideoRTPSource.hh
-include/H265VideoStreamDiscreteFramer.hh
-include/H265VideoStreamFramer.hh
-include/InputFile.hh
-include/JPEGVideoRTPSink.hh
-include/JPEGVideoRTPSource.hh
-include/JPEGVideoSource.hh
-include/liveMedia.hh
-include/liveMedia_version.hh
-include/Locale.hh
-include/MatroskaFile.hh
-include/MatroskaFileServerDemux.hh
-include/Media.hh
-include/MediaSession.hh
-include/MediaSink.hh
-include/MediaSource.hh
-include/MediaTranscodingTable.hh
-include/MP3ADU.hh
-include/MP3ADUinterleaving.hh
-include/MP3ADURTPSink.hh
-include/MP3ADURTPSource.hh
-include/MP3ADUTranscoder.hh
-include/MP3AudioFileServerMediaSubsession.hh
-include/MP3FileSource.hh
-include/MP3Transcoder.hh
-include/MPEG1or2AudioRTPSink.hh
-include/MPEG1or2AudioRTPSource.hh
-include/MPEG1or2AudioStreamFramer.hh
-include/MPEG1or2Demux.hh
-include/MPEG1or2DemuxedElementaryStream.hh
-include/MPEG1or2DemuxedServerMediaSubsession.hh
-include/MPEG1or2FileServerDemux.hh
-include/MPEG1or2VideoFileServerMediaSubsession.hh
-include/MPEG1or2VideoRTPSink.hh
-include/MPEG1or2VideoRTPSource.hh
-include/MPEG1or2VideoStreamDiscreteFramer.hh
-include/MPEG1or2VideoStreamFramer.hh
-include/MPEG2IndexFromTransportStream.hh
-include/MPEG2TransportFileServerMediaSubsession.hh
-include/MPEG2TransportStreamFramer.hh
-include/MPEG2TransportStreamFromESSource.hh
-include/MPEG2TransportStreamFromPESSource.hh
-include/MPEG2TransportStreamIndexFile.hh
-include/MPEG2TransportStreamMultiplexor.hh
-include/MPEG2TransportStreamTrickModeFilter.hh
-include/MPEG2TransportUDPServerMediaSubsession.hh
-include/MPEG4ESVideoRTPSink.hh
-include/MPEG4ESVideoRTPSource.hh
-include/MPEG4GenericRTPSink.hh
-include/MPEG4GenericRTPSource.hh
-include/MPEG4LATMAudioRTPSink.hh
-include/MPEG4LATMAudioRTPSource.hh
-include/MPEG4VideoFileServerMediaSubsession.hh
-include/MPEG4VideoStreamDiscreteFramer.hh
-include/MPEG4VideoStreamFramer.hh
-include/MPEGVideoStreamFramer.hh
-include/MultiFramedRTPSink.hh
-include/MultiFramedRTPSource.hh
-include/OggFile.hh
-include/OggFileServerDemux.hh
-include/OggFileSink.hh
-include/OnDemandServerMediaSubsession.hh
-include/ourMD5.hh
-include/OutputFile.hh
-include/PassiveServerMediaSubsession.hh
-include/ProxyServerMediaSession.hh
-include/QCELPAudioRTPSource.hh
-include/QuickTimeFileSink.hh
-include/QuickTimeGenericRTPSource.hh
-include/RTCP.hh
-include/RTPInterface.hh
-include/RTPSink.hh
-include/RTPSource.hh
-include/RTSPClient.hh
-include/RTSPCommon.hh
-include/RTSPRegisterSender.hh
-include/RTSPServer.hh
-include/RTSPServerSupportingHTTPStreaming.hh
-include/ServerMediaSession.hh
-include/SimpleRTPSink.hh
-include/SimpleRTPSource.hh
-include/SIPClient.hh
-include/StreamReplicator.hh
-include/T140TextRTPSink.hh
-include/TCPStreamSink.hh
-include/TextRTPSink.hh
-include/TheoraVideoRTPSink.hh
-include/TheoraVideoRTPSource.hh
-include/uLawAudioFilter.hh
-include/VideoRTPSink.hh
-include/VorbisAudioRTPSink.hh
-include/VorbisAudioRTPSource.hh
-include/VP8VideoRTPSink.hh
-include/VP8VideoRTPSource.hh
-include/VP9VideoRTPSink.hh
-include/VP9VideoRTPSource.hh
-include/WAVAudioFileServerMediaSubsession.hh
-include/WAVAudioFileSource.hh
-)
-
-INCLUDE_DIRECTORIES(
-${live555Includes}
-)
-
-ADD_LIBRARY( liveMedia STATIC ${LIVE_MEDIA_HEADERS} ${LIVE_MEDIA_SRCS})
diff --git a/ports/live555/master.txt b/ports/live555/master.txt
deleted file mode 100644
index b71c69f68..000000000
--- a/ports/live555/master.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-PROJECT( live555 C CXX)
-
-SET(live555Includes
-${live555_SOURCE_DIR}/live/BasicUsageEnvironment/include
-${live555_SOURCE_DIR}/live/groupsock/include
-${live555_SOURCE_DIR}/live/liveMedia/include
-${live555_SOURCE_DIR}/live/UsageEnvironment/include
-)
-
-ADD_SUBDIRECTORY( live )
diff --git a/ports/live555/mediaServer.txt b/ports/live555/mediaServer.txt
deleted file mode 100644
index 1337b8204..000000000
--- a/ports/live555/mediaServer.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# CMakeLists.txt mediaServer directory
-
-# headers
-SET(MEDIA_SERVER_HDRS
-DynamicRTSPServer.hh
-)
-
-# source files for mediaServer
-SET(MEDIA_SERVER_SRCS 
-DynamicRTSPServer.cpp
-live555MediaServer.cpp
-)
-
-ADD_EXECUTABLE(mediaServer ${MEDIA_SERVER_HDRS} ${MEDIA_SERVER_SRCS})
-TARGET_LINK_LIBRARIES(
-mediaServer
-BasicUsageEnvironment
-groupsock
-liveMedia
-UsageEnvironment
-ws2_32
-winmm
-) 
diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake
index 56abdafa5..9e942d046 100644
--- a/ports/live555/portfile.cmake
+++ b/ports/live555/portfile.cmake
@@ -1,71 +1,35 @@
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    message("live555 cannot currently be built dynamically. Building static instead.")
+    set(VCPKG_LIBRARY_LINKAGE "static")
+endif()
+
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/live)
+set(LIVE_VERSION 2018.02.18)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}/live)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.live555.com/liveMedia/public/live.2018.01.29.tar.gz"
-    FILENAME "live.2018.01.29.tar.gz"
-    SHA512 dfdfcac67acd28f651807de423c6aed00190cfc38ecd361b76d37d8cc27ee2fa91a42a5b8835045680fd7f65c847e41747b948c2c71e6530a3c7e89421c60227
+    URLS "http://www.live555.com/liveMedia/public/live.${LIVE_VERSION}.tar.gz"
+    FILENAME "live.${LIVE_VERSION}.tar.gz"
+    SHA512 9f72f63df4ce763bf1d106814bfc049562cd909ab96fe3e27e13372ce841e53b89ef302af1743fe83fe3a6aa2ba3c1882bd4184155d3674e0fb3c690b4cebf17
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND}  -E copy ${CMAKE_CURRENT_LIST_DIR}/master.txt  ${CURRENT_BUILDTREES_DIR}/src/CMakeLists.txt WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR})
-vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND}  -E copy ${CMAKE_CURRENT_LIST_DIR}/live.txt  ${CURRENT_BUILDTREES_DIR}/src/live/CMakeLists.txt WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR})
-vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND}  -E copy ${CMAKE_CURRENT_LIST_DIR}/BasicUsageEnvironment.txt  ${CURRENT_BUILDTREES_DIR}/src/live/BasicUsageEnvironment/CMakeLists.txt WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR})
-vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND}  -E copy ${CMAKE_CURRENT_LIST_DIR}/groupsock.txt  ${CURRENT_BUILDTREES_DIR}/src/live/groupsock/CMakeLists.txt WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR})
-vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND}  -E copy ${CMAKE_CURRENT_LIST_DIR}/liveMedia.txt  ${CURRENT_BUILDTREES_DIR}/src/live/liveMedia/CMakeLists.txt WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR})
-vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND}  -E copy ${CMAKE_CURRENT_LIST_DIR}/mediaServer.txt  ${CURRENT_BUILDTREES_DIR}/src/live/mediaServer/CMakeLists.txt WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR})
-vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND}  -E copy ${CMAKE_CURRENT_LIST_DIR}/proxyServer.txt  ${CURRENT_BUILDTREES_DIR}/src/live/proxyServer/CMakeLists.txt WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR})
-vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND}  -E copy ${CMAKE_CURRENT_LIST_DIR}/testProgs.txt  ${CURRENT_BUILDTREES_DIR}/src/live/testProgs/CMakeLists.txt WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR})
-vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND}  -E copy ${CMAKE_CURRENT_LIST_DIR}/UsageEnvironment.txt  ${CURRENT_BUILDTREES_DIR}/src/live/UsageEnvironment/CMakeLists.txt WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR})
+vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION})
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
 )
 
-vcpkg_build_cmake()
-
-file(GLOB DLLS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/live/*/Release/*.dll"
-)
-file(GLOB LIBS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/live/*/Release/*.lib"
-)
-file(GLOB DEBUG_DLLS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/live/*/Debug/*.dll"
-)
-file(GLOB DEBUG_LIBS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/live/*/Debug/*.lib"
-
-)
+vcpkg_install_cmake()
 
 file(GLOB HEADERS
-"${CURRENT_BUILDTREES_DIR}/src/live/BasicUsageEnvironment/include/*.h*"
-"${CURRENT_BUILDTREES_DIR}/src/live/groupsock/include/*.h*"
-"${CURRENT_BUILDTREES_DIR}/src/live/liveMedia/include/*.h*"
-"${CURRENT_BUILDTREES_DIR}/src/live/UsageEnvironment/include/*.h*"
+    "${SOURCE_PATH}/BasicUsageEnvironment/include/*.h*"
+    "${SOURCE_PATH}/groupsock/include/*.h*"
+    "${SOURCE_PATH}/liveMedia/include/*.h*"
+    "${SOURCE_PATH}/UsageEnvironment/include/*.h*"
 )
-if(DLLS)
-    file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-endif()
-file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-if(DEBUG_DLLS)
-    file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/live/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/live555 RENAME copyright)
+
+file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/live555 RENAME copyright)
 
 vcpkg_copy_pdbs()
diff --git a/ports/live555/proxyServer.txt b/ports/live555/proxyServer.txt
deleted file mode 100644
index 69677848e..000000000
--- a/ports/live555/proxyServer.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# CMakeLists.txt proxyServer directory
-
-# source files for proxyServer
-SET(PROXY_SERVER_SRCS 
-live555ProxyServer.cpp
-)
-
-ADD_EXECUTABLE(proxyServer ${PROXY_SERVER_SRCS})
-TARGET_LINK_LIBRARIES(
-proxyServer
-BasicUsageEnvironment
-groupsock
-liveMedia
-UsageEnvironment
-ws2_32
-winmm
-) 
diff --git a/ports/live555/testProgs.txt b/ports/live555/testProgs.txt
deleted file mode 100644
index ea9307069..000000000
--- a/ports/live555/testProgs.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-# CMakeLists.txt testProgs directory
-
-# headers
-SET(COMMON_HDRS
-playCommon.hh
-)
-
-# source files for MediaPreEncoderServer
-SET(OPEN_RTSP_SRCS 
-openRTSP.cpp
-playCommon.cpp
-)
-
-SET(PLAY_SIP_SRCS 
-playCommon.cpp
-playSIP.cpp
-)
-
-SET(TEST_AMR_AUDIO_STREAMER_SRCS 
-testAMRAudioStreamer.cpp
-)
-
-SET(TEST_H264_VIDEO_STREAMER_SRCS 
-testH264VideoStreamer.cpp
-)
-
-SET(TEST_H265_VIDEO_STREAMER_SRCS 
-testH265VideoStreamer.cpp
-)
-
-SET(ON_DEMAND_RTSP_SERVER_SRCS 
-testOnDemandRTSPServer.cpp
-)
-
-SET(TEST_RTSP_CLIENT_SRCS 
-testRTSPClient.cpp
-)
-
-ADD_EXECUTABLE(openRTSP ${COMMON_HDRS} ${OPEN_RTSP_SRCS})
-TARGET_LINK_LIBRARIES(
-openRTSP
-BasicUsageEnvironment
-groupsock
-liveMedia
-UsageEnvironment
-ws2_32
-winmm
-) 
-
-ADD_EXECUTABLE(playSip ${COMMON_HDRS} ${PLAY_SIP_SRCS})
-TARGET_LINK_LIBRARIES(
-playSip
-BasicUsageEnvironment
-groupsock
-liveMedia
-UsageEnvironment
-ws2_32
-winmm
-) 
-
-ADD_EXECUTABLE(testAmrAudioStreamer ${COMMON_HDRS} ${TEST_AMR_AUDIO_STREAMER_SRCS})
-TARGET_LINK_LIBRARIES(
-testAmrAudioStreamer
-BasicUsageEnvironment
-groupsock
-liveMedia
-UsageEnvironment
-ws2_32
-winmm
-) 
-
-ADD_EXECUTABLE(testH264VideoStreamer ${COMMON_HDRS} ${TEST_H264_VIDEO_STREAMER_SRCS})
-TARGET_LINK_LIBRARIES(
-testH264VideoStreamer
-BasicUsageEnvironment
-groupsock
-liveMedia
-UsageEnvironment
-ws2_32
-winmm
-) 
-
-ADD_EXECUTABLE(testH265VideoStreamer ${COMMON_HDRS} ${TEST_H265_VIDEO_STREAMER_SRCS})
-TARGET_LINK_LIBRARIES(
-testH265VideoStreamer
-BasicUsageEnvironment
-groupsock
-liveMedia
-UsageEnvironment
-ws2_32
-winmm
-) 
-
-ADD_EXECUTABLE(testOnDemandRTSPServer ${COMMON_HDRS} ${ON_DEMAND_RTSP_SERVER_SRCS})
-TARGET_LINK_LIBRARIES(
-testOnDemandRTSPServer
-BasicUsageEnvironment
-groupsock
-liveMedia
-UsageEnvironment
-ws2_32
-winmm
-) 
-
-ADD_EXECUTABLE(testRTSPClient ${COMMON_HDRS} ${TEST_RTSP_CLIENT_SRCS})
-TARGET_LINK_LIBRARIES(
-testRTSPClient
-BasicUsageEnvironment
-groupsock
-liveMedia
-UsageEnvironment
-ws2_32
-winmm
-)