hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update libsrt wrap to target v1.5.3

Browse source
This commit is contained in:
Thulinma 2024-09-04 10:02:22 +02:00
parent 9f18c39ada
commit e981e26100
3 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/libsrt.wrap
View file

@ -1,7 +1,7 @@
[wrap-git] [wrap-git]
directory = srt directory = srt
url = https://github.com/Haivision/srt.git url = https://github.com/Haivision/srt.git
revision = v1.5.1 revision = v1.5.3
patch_directory = libsrt patch_directory = libsrt
[provide] [provide]

20
subprojects/packagefiles/libsrt/meson.build
View file

@ -1,9 +1,9 @@
project('SRT', 'cpp', 'c', version: '1.5.1') project('SRT', 'cpp', 'c', version: '1.5.3')
if host_machine.system() == 'cygwin' if host_machine.system() == 'cygwin'
add_project_arguments(['-DENABLE_LOGGING=1', '-O3', '-DNDEBUG', '-DENABLE_MONOTONIC_CLOCK=1', '-DENABLE_NEW_RCVBUFFER=1', '-DENABLE_SOCK_CLOEXEC=1', '-DHAI_ENABLE_SRT=1', '-DHAI_PATCH=1', '-DHAVE_INET_PTON=1', '-DHAVE_PTHREAD_GETNAME_NP=1', '-DHAVE_PTHREAD_SETNAME_NP=1', '-DCYGWIN=1', '-DCYGWIN_USE_POSIX', '-DNDEBUG', '-DSRT_DYNAMIC', '-DSRT_ENABLE_APP_READER', '-DSRT_ENABLE_CLOSE_SYNCH', '-DSRT_ENABLE_ENCRYPTION', '-DSRT_EXPORTS', '-DSRT_VERSION="1.5.1"', '-DUSE_MBEDTLS=1', '-D_GNU_SOURCE'], language: ['cpp','c']) add_project_arguments(['-DENABLE_LOGGING=1', '-O3', '-DNDEBUG', '-DENABLE_MONOTONIC_CLOCK=1', '-DENABLE_NEW_RCVBUFFER=1', '-DENABLE_SOCK_CLOEXEC=1', '-DHAI_ENABLE_SRT=1', '-DHAI_PATCH=1', '-DHAVE_INET_PTON=1', '-DHAVE_PTHREAD_GETNAME_NP=1', '-DHAVE_PTHREAD_SETNAME_NP=1', '-DCYGWIN=1', '-DCYGWIN_USE_POSIX', '-DNDEBUG', '-DSRT_DYNAMIC', '-DSRT_ENABLE_APP_READER', '-DSRT_ENABLE_CLOSE_SYNCH', '-DSRT_ENABLE_ENCRYPTION', '-DSRT_EXPORTS', '-DSRT_VERSION="1.5.3"', '-DUSE_MBEDTLS=1', '-D_GNU_SOURCE'], language: ['cpp','c'])
else else
add_project_arguments(['-DENABLE_LOGGING=1', '-O3', '-DNDEBUG', '-DENABLE_MONOTONIC_CLOCK=1', '-DENABLE_NEW_RCVBUFFER=1', '-DENABLE_SOCK_CLOEXEC=1', '-DHAI_ENABLE_SRT=1', '-DHAI_PATCH=1', '-DHAVE_INET_PTON=1', '-DHAVE_PTHREAD_GETNAME_NP=1', '-DHAVE_PTHREAD_SETNAME_NP=1', '-DLINUX=1', '-DNDEBUG', '-DSRT_DYNAMIC', '-DSRT_ENABLE_APP_READER', '-DSRT_ENABLE_BINDTODEVICE', '-DSRT_ENABLE_CLOSE_SYNCH', '-DSRT_ENABLE_ENCRYPTION', '-DSRT_EXPORTS', '-DSRT_VERSION="1.5.1"', '-DUSE_MBEDTLS=1', '-D_GNU_SOURCE'], language: ['cpp','c']) add_project_arguments(['-DENABLE_LOGGING=1', '-O3', '-DNDEBUG', '-DENABLE_MONOTONIC_CLOCK=1', '-DENABLE_NEW_RCVBUFFER=1', '-DENABLE_SOCK_CLOEXEC=1', '-DHAI_ENABLE_SRT=1', '-DHAI_PATCH=1', '-DHAVE_INET_PTON=1', '-DHAVE_PTHREAD_GETNAME_NP=1', '-DHAVE_PTHREAD_SETNAME_NP=1', '-DLINUX=1', '-DNDEBUG', '-DSRT_DYNAMIC', '-DSRT_ENABLE_APP_READER', '-DSRT_ENABLE_BINDTODEVICE', '-DSRT_ENABLE_CLOSE_SYNCH', '-DSRT_ENABLE_ENCRYPTION', '-DSRT_EXPORTS', '-DSRT_VERSION="1.5.3"', '-DUSE_MBEDTLS=1', '-D_GNU_SOURCE'], language: ['cpp','c'])
endif endif
@ -24,7 +24,8 @@ subdir('srt')
srt_src = files( srt_src = files(
'srtcore/api.cpp', 'srtcore/api.cpp',
'srtcore/buffer.cpp', 'srtcore/buffer_snd.cpp',
'srtcore/buffer_tools.cpp',
'srtcore/buffer_rcv.cpp', 'srtcore/buffer_rcv.cpp',
'srtcore/cache.cpp', 'srtcore/cache.cpp',
'srtcore/channel.cpp', 'srtcore/channel.cpp',
@ -71,7 +72,8 @@ libsrt = library(
'srt', 'srt',
sources: [srt_src, versionfile], sources: [srt_src, versionfile],
dependencies: [mbedtls_lib, mbedx509_lib, mbedcrypto_lib, thread_dep], dependencies: [mbedtls_lib, mbedx509_lib, mbedcrypto_lib, thread_dep],
include_directories: ['srt', 'haicrypt', 'srtcore'] include_directories: ['srt', 'haicrypt', 'srtcore'],
install: true
) )
srt_dep = declare_dependency( srt_dep = declare_dependency(
@ -81,3 +83,11 @@ srt_dep = declare_dependency(
include_directories: include_directories('.'), include_directories: include_directories('.'),
) )
pkg = import('pkgconfig')
pkg.generate(libraries : libsrt,
subdirs : ['.', 'srt'],
version : '1.5.3',
name : 'srt',
filebase : 'srt',
description : 'Haivision SRT library')

19
subprojects/packagefiles/libsrt/srt/meson.build
View file

@ -1,15 +1,14 @@
versionfile = configure_file(format: 'cmake@', output: 'version.h', input: files('../srtcore/version.h.in'), configuration: { versionfile = configure_file(format: 'cmake@', output: 'version.h', input: files('../srtcore/version.h.in'), configuration: {
'SRT_VERSION_MAJOR': 1, 'SRT_VERSION_MAJOR': 1,
'SRT_VERSION_MINOR' : 5, 'SRT_VERSION_MINOR' : 5,
'SRT_VERSION_PATCH': 1, 'SRT_VERSION_PATCH': 3,
'CI_BUILD_NUMBER_STRING': '"1.5.1"', 'CI_BUILD_NUMBER_STRING': '"1.5.3"',
'SRT_VERSION': '1.5.1', 'SRT_VERSION': '1.5.3',
}) }, install_dir: 'include/srt')
header_tgts += configure_file(copy:true, input: files('../srtcore/srt.h'), output: 'srt.h') header_tgts += configure_file(copy:true, install_dir: 'include/srt', input: files('../srtcore/srt.h'), output: 'srt.h')
header_tgts += configure_file(copy:true, input: files('../srtcore/logging_api.h'), output: 'logging_api.h') header_tgts += configure_file(copy:true, install_dir: 'include/srt', input: files('../srtcore/logging_api.h'), output: 'logging_api.h')
header_tgts += configure_file(copy:true, input: files('../srtcore/access_control.h'), output: 'access_control.h') header_tgts += configure_file(copy:true, install_dir: 'include/srt', input: files('../srtcore/access_control.h'), output: 'access_control.h')
header_tgts += configure_file(copy:true, input: files('../srtcore/platform_sys.h'), output: 'platform_sys.h') header_tgts += configure_file(copy:true, install_dir: 'include/srt', input: files('../srtcore/platform_sys.h'), output: 'platform_sys.h')
header_tgts += configure_file(copy:true, input: files('../srtcore/udt.h'), output: 'udt.h') header_tgts += configure_file(copy:true, install_dir: 'include/srt', input: files('../srtcore/udt.h'), output: 'udt.h')