lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 25.0.3+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-03-25 09:07:22 +01:00
parent 04fe0efc67
commit 8b2e5f2130
569 changed files with 62491 additions and 5875 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmake/Modules/CopyMSVCBins.cmake
View file

@ -1,4 +1,4 @@
# Doesn't realy make sense anywhere else
# Doesn't really make sense anywhere else
if(NOT MSVC)
return()
endif()
@ -8,7 +8,7 @@ if(COPIED_DEPENDENCIES)
return()
endif()
option(COPY_DEPENDENCIES "Automaticaly try copying all dependencies" ON)
option(COPY_DEPENDENCIES "Automatically try copying all dependencies" ON)
if(NOT COPY_DEPENDENCIES)
return()
endif()
@ -65,6 +65,12 @@ file(GLOB FFMPEG_BIN_FILES
"${FFMPEG_avcodec_INCLUDE_DIR}/../bin/libvpx*.dll"
"${FFMPEG_avcodec_INCLUDE_DIR}/bin/libvpx*.dll"
"${FFMPEG_avcodec_INCLUDE_DIR}/../bin/libsrt*.dll"
"${FFMPEG_avcodec_INCLUDE_DIR}/bin/libsrt*.dll"
"${FFMPEG_avcodec_INCLUDE_DIR}/../bin/libmbedcrypto*.dll"
"${FFMPEG_avcodec_INCLUDE_DIR}/bin/libmbedcrypto*.dll"
"${FFMPEG_avcodec_INCLUDE_DIR}/../bin${_bin_suffix}/libopus*.dll"
"${FFMPEG_avcodec_INCLUDE_DIR}/../bin${_bin_suffix}/opus*.dll"
"${FFMPEG_avcodec_INCLUDE_DIR}/bin${_bin_suffix}/libopus*.dll"

2
cmake/Modules/FindFFmpeg.cmake
View file

@ -3,7 +3,7 @@
#
# FFMPEG_FOUND - All required components and the core library were found
# FFMPEG_INCLUDE_DIRS - Combined list of all components include dirs
# FFMPEG_LIBRARIES - Combined list of all componenets libraries
# FFMPEG_LIBRARIES - Combined list of all components libraries
# FFMPEG_VERSION_STRING - Version of the first component requested
#
# For each requested component the following variables are defined:

70
cmake/Modules/FindVulkan.cmake Normal file
View file

@ -0,0 +1,70 @@
# Once done these will be defined:
#
# VULKAN_FOUND
# VULKAN_INCLUDE_DIRS
# VULKAN_LIBRARIES
#
# For use in OBS:
#
# VULKAN_INCLUDE_DIR
find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND)
pkg_check_modules(_VULKAN QUIET vulkan)
endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_lib_suffix 64)
else()
set(_lib_suffix 32)
endif()
find_path(VULKAN_INCLUDE_DIR
NAMES vulkan/vulkan.h
HINTS
ENV vulkanPath${_lib_suffix}
ENV vulkanPath
ENV DepsPath${_lib_suffix}
ENV DepsPath
ENV VULKAN_SDK
${vulkanPath${_lib_suffix}}
${vulkanPath}
${DepsPath${_lib_suffix}}
${DepsPath}
${_VULKAN_INCLUDE_DIRS}
PATHS
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES
include)
find_library(VULKAN_LIB
NAMES ${_VULKAN_LIBRARIES} vulkan-1 vulkan libvulkan
HINTS
ENV vulkanPath${_lib_suffix}
ENV vulkanPath
ENV DepsPath${_lib_suffix}
ENV DepsPath
ENV VULKAN_SDK
${vulkanPath${_lib_suffix}}
${vulkanPath}
${DepsPath${_lib_suffix}}
${DepsPath}
${_VULKAN_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(vulkan DEFAULT_MSG VULKAN_LIB VULKAN_INCLUDE_DIR)
mark_as_advanced(VULKAN_INCLUDE_DIR VULKAN_LIB)
if(VULKAN_FOUND)
set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR})
set(VULKAN_LIBRARIES ${VULKAN_LIB})
endif()