Squashed 'external/toxcore/c-toxcore/' changes from 03e9fbf3703..55752a2e2ef
55752a2e2ef fix(toxav): pass video bit rate as kbit Previously we unintentionally made it Mbit. 7e573280a75 docs(toxav): fix docs of toxav.h - fix units to be more readable - use width before height consistently - video -> audio typo 5f88a084e8c fix: friend_connections leak on allocation failure clean up when it only contains connections in the NONE state 6d27a1ae178 fix: wrong comment for closelist ce4f29e8036 cleanup: Fix all `-Wsign-compare` warnings. 4d4251c397f chore: lower cirrus ci timeout drastically 40676284507 fix: events leak that can occur if allocation fails rare in practice, found by fuzzing 9610ac31c5f fix: Return an error instead of crashing on nullptr args in NGC. a57c2c8f956 refactor: Make ToxAV independent of toxcore internals. 5752fc29f86 refactor: Make tox-bootstrapd use bool instead of int df675786eb2 chore: Add release-drafter github action. 03fd7a69dcf chore: Use toktok's cmp instead of upstream. 350c0ba1205 cleanup: Sort apk/apt install commands in Dockerfiles. 8c1bda502cb chore(deps): bump golang.org/x/net ddb9d3210da chore: Upgrade to FreeBSD 14.1 in cirrus build. e9076f45bd3 chore(cmake): set options changes as cache and with force git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 55752a2e2ef894bfa6d7a2a21a0278e3f2bede7d
This commit is contained in:
@@ -161,7 +161,7 @@ option(DHT_BOOTSTRAP "Enable building of DHT_bootstrap" ON)
|
||||
option(BOOTSTRAP_DAEMON "Enable building of tox-bootstrapd" ON)
|
||||
if(BOOTSTRAP_DAEMON AND WIN32)
|
||||
message(WARNING "Building tox-bootstrapd for Windows is not supported, disabling")
|
||||
set(BOOTSTRAP_DAEMON OFF)
|
||||
set(BOOTSTRAP_DAEMON OFF CACHE BOOL "" FORCE)
|
||||
endif()
|
||||
|
||||
option(BUILD_FUZZ_TESTS "Build fuzzing harnesses" OFF)
|
||||
@@ -177,6 +177,7 @@ include(Dependencies)
|
||||
|
||||
if(MUST_BUILD_TOXAV)
|
||||
set(NO_TOXAV_ERROR_TYPE SEND_ERROR)
|
||||
set(BUILD_TOXAV ON CACHE BOOL "" FORCE)
|
||||
else()
|
||||
set(NO_TOXAV_ERROR_TYPE WARNING)
|
||||
endif()
|
||||
@@ -184,11 +185,11 @@ endif()
|
||||
if(BUILD_TOXAV)
|
||||
if(NOT OPUS_FOUND)
|
||||
message(${NO_TOXAV_ERROR_TYPE} "Option BUILD_TOXAV is enabled but required library OPUS was not found.")
|
||||
set(BUILD_TOXAV OFF)
|
||||
set(BUILD_TOXAV OFF CACHE BOOL "" FORCE)
|
||||
endif()
|
||||
if(NOT VPX_FOUND)
|
||||
message(${NO_TOXAV_ERROR_TYPE} "Option BUILD_TOXAV is enabled but required library VPX was not found.")
|
||||
set(BUILD_TOXAV OFF)
|
||||
set(BUILD_TOXAV OFF CACHE BOOL "" FORCE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -391,6 +392,7 @@ if(BUILD_TOXAV)
|
||||
toxav/rtp.h
|
||||
toxav/toxav.c
|
||||
toxav/toxav.h
|
||||
toxav/toxav_hacks.h
|
||||
toxav/toxav_old.c
|
||||
toxav/video.c
|
||||
toxav/video.h)
|
||||
@@ -597,7 +599,7 @@ if(BOOTSTRAP_DAEMON)
|
||||
add_subdirectory(other/bootstrap_daemon)
|
||||
else()
|
||||
message(WARNING "Option BOOTSTRAP_DAEMON is enabled but required library LIBCONFIG was not found.")
|
||||
set(BOOTSTRAP_DAEMON OFF)
|
||||
set(BOOTSTRAP_DAEMON OFF CACHE BOOL "" FORCE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
Reference in New Issue
Block a user