early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,38 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1008,6 +1008,7 @@ set (INSTALL_SHARED_DIR ${CMAKE_INSTALL_LIBDIR})
if (CYGWIN)
set (INSTALL_SHARED_DIR ${CMAKE_INSTALL_BINDIR})
endif()
+set(CMAKE_INSTALL_INCLUDEDIR include)
message(STATUS "INSTALL DIRS: bin=${CMAKE_INSTALL_BINDIR} lib=${CMAKE_INSTALL_LIBDIR} shlib=${INSTALL_SHARED_DIR} include=${CMAKE_INSTALL_INCLUDEDIR}")
@@ -1085,7 +1085,7 @@
macro(srt_add_program name)
srt_add_program_dont_install(${name} ${ARGN})
- install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(TARGETS ${name} RUNTIME DESTINATION tools)
endmacro()
macro(srt_make_application name)
@@ -1124,7 +1124,7 @@ endmacro()
macro(srt_add_application name) # ARGN=sources...
srt_add_program(${name} apps/${name}.cpp ${ARGN})
srt_make_application(${name})
- install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(TARGETS ${name} RUNTIME DESTINATION tools)
endmacro()
## FIXME: transmitmedia.cpp does not build on OpenBSD
@@ -1324,7 +1324,7 @@ if (ENABLE_UNITTESTS AND ENABLE_CXX11)
endif()
-install(PROGRAMS scripts/srt-ffplay DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(PROGRAMS scripts/srt-ffplay DESTINATION tools)
if (DEFINED SRT_EXTRA_APPS_INC)

39
externals/vcpkg/ports/libsrt/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,39 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Haivision/srt
REF v1.4.4
SHA512 0D51E0EF73F4AA7EB284288CDBBD75B1C161969C2C2FED3A6D4E13A931341CA41DFCF2D6C1B9728F72B43454A9FDE3764DA67A27AF9F0C99A6818682E4F4D4BA
HEAD_REF master
PATCHES fix-dependency-install.patch
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(BUILD_DYNAMIC ON)
set(BUILD_STATIC OFF)
else()
set(BUILD_DYNAMIC OFF)
set(BUILD_STATIC ON)
endif()
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
tool ENABLE_APPS
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
-DENABLE_SHARED=${BUILD_DYNAMIC}
-DENABLE_STATIC=${BUILD_STATIC}
-DENABLE_UNITTESTS=OFF
-DUSE_OPENSSL_PC=OFF
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

20
externals/vcpkg/ports/libsrt/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,20 @@
{
"name": "libsrt",
"version": "1.4.4",
"port-version": 2,
"description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.",
"homepage": "https://github.com/Haivision/srt",
"supports": "!uwp",
"dependencies": [
"openssl",
{
"name": "vcpkg-cmake",
"host": true
}
],
"features": {
"tool": {
"description": "Builds libsrt executable"
}
}
}