New upstream version 26.0.0+dfsg1
This commit is contained in:
parent
8e020cdacb
commit
240080891f
837 changed files with 41275 additions and 9196 deletions
|
|
@ -4,9 +4,6 @@
|
|||
# LIBVLC_INCLUDE_DIRS
|
||||
# LIBVLC_LIBRARIES
|
||||
#
|
||||
# For use in OBS:
|
||||
#
|
||||
# VLC_INCLUDE_DIR
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
|
|
@ -59,14 +56,11 @@ find_library(VLC_LIB
|
|||
../bin${_lib_suffix} ../bin)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(LibVLC_INCLUDES DEFAULT_MSG VLC_INCLUDE_DIR)
|
||||
find_package_handle_standard_args(LibVLC DEFAULT_MSG VLC_LIB VLC_INCLUDE_DIR)
|
||||
# OBS doesnt depend on linking, so we dont include VLC_LIB here as required.
|
||||
find_package_handle_standard_args(LibVLC DEFAULT_MSG VLC_INCLUDE_DIR)
|
||||
mark_as_advanced(VLC_INCLUDE_DIR VLC_LIB)
|
||||
|
||||
if(LIBVLC_INCLUDES_FOUND)
|
||||
set(LIBVLC_INCLUDE_DIRS ${VLC_INCLUDE_DIR})
|
||||
endif()
|
||||
|
||||
if(LIBVLC_FOUND)
|
||||
set(LIBVLC_LIBRARIES ${VLC_LIB})
|
||||
set(LIBVLC_INCLUDE_DIRS ${VLC_INCLUDE_DIR})
|
||||
endif()
|
||||
|
|
|
|||
68
cmake/Modules/FindLibrnnoise.cmake
Normal file
68
cmake/Modules/FindLibrnnoise.cmake
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
# Once done these will be defined:
|
||||
#
|
||||
# LIBRNNOISE_FOUND
|
||||
# LIBRNNOISE_INCLUDE_DIRS
|
||||
# LIBRNNOISE_LIBRARIES
|
||||
#
|
||||
# For use in OBS:
|
||||
#
|
||||
# RNNOISE_INCLUDE_DIR
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
pkg_check_modules(_RNNOISE QUIET rnnoise)
|
||||
endif()
|
||||
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
set(_lib_suffix 64)
|
||||
else()
|
||||
set(_lib_suffix 32)
|
||||
endif()
|
||||
|
||||
find_path(RNNOISE_INCLUDE_DIR
|
||||
NAMES rnnoise.h
|
||||
HINTS
|
||||
ENV rnnoisePath${_lib_suffix}
|
||||
ENV rnnoisePath
|
||||
ENV DepsPath${_lib_suffix}
|
||||
ENV DepsPath
|
||||
${rnnoisePath${_lib_suffix}}
|
||||
${rnnoisePath}
|
||||
${DepsPath${_lib_suffix}}
|
||||
${DepsPath}
|
||||
${_RNNOISE_INCLUDE_DIRS}
|
||||
PATHS
|
||||
/usr/include /usr/local/include /opt/local/include /sw/include
|
||||
PATH_SUFFIXES
|
||||
include)
|
||||
|
||||
find_library(RNNOISE_LIB
|
||||
NAMES ${_RNNOISE_LIBRARIES} rnnoise
|
||||
HINTS
|
||||
ENV rnnoisePath${_lib_suffix}
|
||||
ENV rnnoisePath
|
||||
ENV DepsPath${_lib_suffix}
|
||||
ENV DepsPath
|
||||
${rnnoisePath${_lib_suffix}}
|
||||
${rnnoisePath}
|
||||
${DepsPath${_lib_suffix}}
|
||||
${DepsPath}
|
||||
${_RNNOISE_LIBRARY_DIRS}
|
||||
PATHS
|
||||
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
|
||||
PATH_SUFFIXES
|
||||
lib${_lib_suffix} lib
|
||||
libs${_lib_suffix} libs
|
||||
bin${_lib_suffix} bin
|
||||
../lib${_lib_suffix} ../lib
|
||||
../libs${_lib_suffix} ../libs
|
||||
../bin${_lib_suffix} ../bin)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(Librnnoise DEFAULT_MSG RNNOISE_LIB RNNOISE_INCLUDE_DIR)
|
||||
mark_as_advanced(RNNOISE_INCLUDE_DIR RNNOISE_LIB)
|
||||
|
||||
if(LIBRNNOISE_FOUND)
|
||||
set(LIBRNNOISE_INCLUDE_DIRS ${RNNOISE_INCLUDE_DIR})
|
||||
set(LIBRNNOISE_LIBRARIES ${RNNOISE_LIB})
|
||||
endif()
|
||||
|
|
@ -24,7 +24,7 @@ find_library(V4L2_LIB
|
|||
/usr/lib /usr/local/lib /opt/local/lib)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(LibV4L2 DEFAULT_MSG V4L2_LIB V4L2_INCLUDE_DIR)
|
||||
find_package_handle_standard_args(Libv4l2 DEFAULT_MSG V4L2_LIB V4L2_INCLUDE_DIR)
|
||||
mark_as_advanced(V4L2_INCLUDE_DIR V4L2_LIB)
|
||||
|
||||
if(LIBV4L2_FOUND)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
# Once done these will be defined:
|
||||
#
|
||||
# LIBMBEDTLS_FOUND
|
||||
# LIBMBEDTLS_INCLUDE_DIRS
|
||||
# LIBMBEDTLS_LIBRARIES
|
||||
# MBEDTLS_FOUND
|
||||
# MBEDTLS_INCLUDE_DIRS
|
||||
# MBEDTLS_LIBRARIES
|
||||
#
|
||||
# For use in OBS:
|
||||
#
|
||||
# MBEDTLS_INCLUDE_DIR
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
|
|
@ -122,22 +119,19 @@ endif()
|
|||
|
||||
# If we find all three libraries, then go ahead.
|
||||
if(MBEDTLS_LIB AND MBEDCRYPTO_LIB AND MBEDX509_LIB)
|
||||
set(LIBMBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
|
||||
set(LIBMBEDTLS_LIBRARIES ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB})
|
||||
set(MBEDTLS_INCLUDE_DIRS ${LIBMBEDTLS_INCLUDE_DIRS})
|
||||
set(MBEDTLS_LIBRARIES ${LIBMBEDTLS_LIBRARIES})
|
||||
set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
|
||||
set(MBEDTLS_LIBRARIES ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB})
|
||||
|
||||
# Otherwise, if we find MBEDTLS_LIB, and it has both CRYPTO and x509
|
||||
# within the single lib (i.e. a windows build environment), then also
|
||||
# feel free to go ahead.
|
||||
elseif(MBEDTLS_LIB AND MBEDTLS_INCLUDES_CRYPTO AND MBEDTLS_INCLUDES_X509)
|
||||
set(LIBMBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
|
||||
set(LIBMBEDTLS_LIBRARIES ${MBEDTLS_LIB})
|
||||
set(MBEDTLS_INCLUDE_DIRS ${LIBMBEDTLS_INCLUDE_DIRS})
|
||||
set(MBEDTLS_LIBRARIES ${LIBMBEDTLS_LIBRARIES})
|
||||
set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
|
||||
set(MBEDTLS_LIBRARIES ${MBEDTLS_LIB})
|
||||
endif()
|
||||
|
||||
# Now we've accounted for the 3-vs-1 library case:
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(Libmbedtls DEFAULT_MSG MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS)
|
||||
mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS)
|
||||
find_package_handle_standard_args(MbedTLS DEFAULT_MSG MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS)
|
||||
mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIB MBEDCRYPTO_LIB MBEDX509_LIB)
|
||||
|
||||
|
|
|
|||
33
cmake/Modules/FindOSS.cmake
Normal file
33
cmake/Modules/FindOSS.cmake
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
# Try to find OSS on a *nix system
|
||||
#
|
||||
# OSS_FOUND - True if OSS is available
|
||||
# OSS_INCLUDE_DIR - Include directory of OSS header
|
||||
# OSS_HEADER_NAME - OSS header file name
|
||||
#
|
||||
|
||||
IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
||||
set(OSS_HEADER_NAME "sys/soundcard.h")
|
||||
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "DragonFly")
|
||||
set(OSS_HEADER_NAME "sys/soundcard.h")
|
||||
ENDIF()
|
||||
|
||||
find_path(OSS_INCLUDE_DIR "${OSS_HEADER_NAME}"
|
||||
"/usr/include"
|
||||
"/usr/local/include"
|
||||
)
|
||||
|
||||
if (OSS_INCLUDE_DIR)
|
||||
set(OSS_FOUND True)
|
||||
else (OSS_INCLUDE_DIR)
|
||||
set(OSS_FOUND)
|
||||
endif (OSS_INCLUDE_DIR)
|
||||
|
||||
if (OSS_FOUND)
|
||||
message(STATUS "Found OSS header: ${OSS_INCLUDE_DIR}/${OSS_HEADER_NAME}")
|
||||
else (OSS_FOUND)
|
||||
if (OSS_FIND_REQUIRED)
|
||||
message(FATAL_ERROR "Could not find OSS header file")
|
||||
endif (OSS_FIND_REQUIRED)
|
||||
endif (OSS_FOUND)
|
||||
|
||||
mark_as_advanced(OSS_FOUND OSS_INCLUDE_DIR OSS_HEADER_NAME)
|
||||
|
|
@ -1,3 +1,9 @@
|
|||
if(DEFINED SWIGDIR)
|
||||
list(APPEND CMAKE_PREFIX_PATH "${SWIGDIR}")
|
||||
elseif(DEFINED ENV{SWIGDIR})
|
||||
list(APPEND CMAKE_PREFIX_PATH "$ENV{SWIGDIR}")
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
SET(_LIB_SUFFIX 64)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
find_package(PkgConfig QUIET)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
pkg_check_modules(_UDEV QUIET udev)
|
||||
pkg_check_modules(_UDEV QUIET libudev)
|
||||
endif()
|
||||
|
||||
find_path(UDEV_INCLUDE_DIR
|
||||
|
|
@ -61,7 +61,7 @@ find_library(VULKAN_LIB
|
|||
../bin${_lib_suffix} ../bin)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(vulkan DEFAULT_MSG VULKAN_LIB VULKAN_INCLUDE_DIR)
|
||||
find_package_handle_standard_args(Vulkan DEFAULT_MSG VULKAN_LIB VULKAN_INCLUDE_DIR)
|
||||
mark_as_advanced(VULKAN_INCLUDE_DIR VULKAN_LIB)
|
||||
|
||||
if(VULKAN_FOUND)
|
||||
|
|
|
|||
|
|
@ -204,30 +204,19 @@ macro(_XCB_HANDLE_COMPONENT _comp)
|
|||
|
||||
find_path(XCB_${_comp}_INCLUDE_DIR NAMES ${_header} HINTS ${PKG_XCB_INCLUDE_DIRS})
|
||||
find_library(XCB_${_comp}_LIBRARY NAMES ${_lib} HINTS ${PKG_XCB_LIBRARY_DIRS})
|
||||
mark_as_advanced(XCB_${_comp}_LIBRARY XCB_${_comp}_INCLUDE_DIR)
|
||||
|
||||
if(XCB_${_comp}_INCLUDE_DIR AND XCB_${_comp}_LIBRARY)
|
||||
set(XCB_${_comp}_FOUND TRUE)
|
||||
list(APPEND XCB_INCLUDE_DIRS ${XCB_${_comp}_INCLUDE_DIR})
|
||||
list(APPEND XCB_LIBRARIES ${XCB_${_comp}_LIBRARY})
|
||||
if (NOT XCB_FIND_QUIETLY)
|
||||
message(STATUS "XCB[${_comp}]: Found component ${_comp}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(XCB_FIND_REQUIRED_${_comp})
|
||||
list(APPEND requiredComponents XCB_${_comp}_FOUND)
|
||||
endif()
|
||||
|
||||
find_package_handle_standard_args(XCB_${_comp} DEFAULT_MSG XCB_${_comp}_LIBRARY XCB_${_comp}_INCLUDE_DIR)
|
||||
|
||||
mark_as_advanced(XCB_${_comp}_LIBRARY XCB_${_comp}_INCLUDE_DIR)
|
||||
|
||||
# compatibility for old variable naming
|
||||
set(XCB_${_comp}_INCLUDE_DIRS ${XCB_${_comp}_INCLUDE_DIR})
|
||||
set(XCB_${_comp}_LIBRARIES ${XCB_${_comp}_LIBRARY})
|
||||
endmacro()
|
||||
|
||||
IF (NOT WIN32)
|
||||
include(FindPackageHandleStandardArgs)
|
||||
# Use pkg-config to get the directories and then use these values
|
||||
# in the FIND_PATH() and FIND_LIBRARY() calls
|
||||
find_package(PkgConfig)
|
||||
|
|
@ -243,9 +232,11 @@ IF (NOT WIN32)
|
|||
list(REMOVE_DUPLICATES XCB_INCLUDE_DIRS)
|
||||
endif()
|
||||
|
||||
find_package_handle_standard_args(XCB DEFAULT_MSG XCB_LIBRARIES XCB_INCLUDE_DIRS ${requiredComponents})
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(XCB
|
||||
REQUIRED_VARS XCB_LIBRARIES XCB_INCLUDE_DIRS
|
||||
HANDLE_COMPONENTS)
|
||||
|
||||
# compatibility for old variable naming
|
||||
set(XCB_INCLUDE_DIR ${XCB_INCLUDE_DIRS})
|
||||
|
||||
ENDIF (NOT WIN32)
|
||||
|
|
|
|||
|
|
@ -4,9 +4,6 @@
|
|||
# ZLIB_INCLUDE_DIRS
|
||||
# ZLIB_LIBRARIES
|
||||
#
|
||||
# For use in OBS:
|
||||
#
|
||||
# ZLIB_INCLUDE_DIR
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
|
|
@ -59,7 +56,7 @@ find_library(ZLIB_LIB
|
|||
../bin${_lib_suffix} ../bin)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(zlib DEFAULT_MSG ZLIB_LIB ZLIB_INCLUDE_DIR)
|
||||
find_package_handle_standard_args(ZLIB DEFAULT_MSG ZLIB_LIB ZLIB_INCLUDE_DIR)
|
||||
mark_as_advanced(ZLIB_INCLUDE_DIR ZLIB_LIB)
|
||||
|
||||
if(ZLIB_FOUND)
|
||||
|
|
|
|||
|
|
@ -504,6 +504,23 @@ function(install_obs_data target datadir datadest)
|
|||
endif()
|
||||
endfunction()
|
||||
|
||||
function(install_obs_data_from_abs_path target datadir datadest)
|
||||
install(DIRECTORY ${datadir}/
|
||||
DESTINATION "${OBS_DATA_DESTINATION}/${datadest}"
|
||||
USE_SOURCE_PERMISSIONS)
|
||||
add_custom_command(TARGET ${target} POST_BUILD
|
||||
COMMAND "${CMAKE_COMMAND}" -E copy_directory
|
||||
"${datadir}" "${OBS_OUTPUT_DIR}/$<CONFIGURATION>/data/${datadest}"
|
||||
VERBATIM)
|
||||
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND DEFINED ENV{obsInstallerTempDir})
|
||||
add_custom_command(TARGET ${target} POST_BUILD
|
||||
COMMAND "${CMAKE_COMMAND}" -E copy_directory
|
||||
"${datadir}" "$ENV{obsInstallerTempDir}/${OBS_DATA_DESTINATION}/${datadest}"
|
||||
VERBATIM)
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
function(install_obs_data_file target datafile datadest)
|
||||
install(FILES ${datafile}
|
||||
DESTINATION "${OBS_DATA_DESTINATION}/${datadest}")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue