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

New upstream version 18.0.1+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2017-04-19 21:54:15 +02:00
parent 6efda2859e
commit f2cf6cce50
1337 changed files with 41178 additions and 84670 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmake/Modules/CopyMSVCBins.cmake
View file

@ -8,7 +8,7 @@ if(COPIED_DEPENDENCIES)
return()
endif()
option(COPY_DEPENDENCIES "Automaticaly try copying all dependencies" OFF)
option(COPY_DEPENDENCIES "Automaticaly try copying all dependencies" ON)
if(NOT COPY_DEPENDENCIES)
return()
endif()
@ -19,12 +19,6 @@ else()
set(_bin_suffix 32)
endif()
find_package(Libavcodec QUIET)
find_package(Libx264 QUIET)
find_package(Libfdk QUIET)
find_package(ssl QUIET)
find_package(Qt5Core QUIET)
file(GLOB FFMPEG_BIN_FILES
"${FFMPEG_avcodec_INCLUDE_DIR}/../bin/avcodec-*.dll"
"${FFMPEG_avcodec_INCLUDE_DIR}/../bin${_bin_suffix}/avcodec-*.dll"

4
cmake/Modules/FindFFmpeg.cmake
View file

@ -49,6 +49,8 @@ function(find_ffmpeg_library component header)
${DepsPath${_lib_suffix}}
${DepsPath}
${PC_FFMPEG_${component}_INCLUDE_DIRS}
PATHS
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav include)
find_library(FFMPEG_${component}_LIBRARY
@ -64,6 +66,8 @@ function(find_ffmpeg_library component header)
${DepsPath${_lib_suffix}}
${DepsPath}
${PC_FFMPEG_${component}_LIBRARY_DIRS}
PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
PATH_SUFFIXES
lib${_lib_suffix} lib
libs${_lib_suffix} libs

40
cmake/Modules/FindRSSDK.cmake Normal file
View file

@ -0,0 +1,40 @@
# Once done these will be defined:
#
# RSSDK_FOUND
# RSSDK_INCLUDE_DIRS
# RSSDK_LIBRARIES
#
# For use in OBS:
#
# RSSDK_INCLUDE_DIR
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_RSSDK_lib_dir "x64")
else()
set(_RSSDK_lib_dir "Win32")
endif()
find_path(RSSDK_INCLUDE_DIR
NAMES pxcsession.h
HINTS
ENV RSSDK_DIR
PATH_SUFFIXES
include)
find_library(RSSDK_LIB
NAMES libpxc
HINTS
ENV RSSDK_DIR
PATH_SUFFIXES
lib/${_RSSDK_lib_dir}
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(RSSDK DEFAULT_MSG RSSDK_LIB RSSDK_INCLUDE_DIR)
mark_as_advanced(RSSDK_INCLUDE_DIR RSSDK_LIB)
if(RSSDK_FOUND)
set(RSSDK_INCLUDE_DIRS ${RSSDK_INCLUDE_DIR})
set(RSSDK_LIBRARIES ${RSSDK_LIB})
endif()

20
cmake/Modules/IDLFileHelper.cmake
View file

@ -1,4 +1,4 @@
macro(add_idl_files generated_files)
macro(add_idl_files_base generated_files with_tlb)
foreach(filename ${ARGN})
get_filename_component(file_we ${filename} NAME_WE)
get_filename_component(file_path ${filename} PATH)
@ -9,10 +9,18 @@ macro(add_idl_files generated_files)
set(bin_file_c ${CMAKE_CURRENT_BINARY_DIR}/${file_c})
if(MSVC)
if(${with_tlb})
set(file_tlb ${file_we}.tlb)
set(bin_file_tlb ${CMAKE_CURRENT_BINARY_DIR}/${file_tlb})
set(tlb_opt "")
else()
set(tlb_opt "/notlb")
endif()
add_custom_command(
OUTPUT ${bin_file_h} ${bin_file_c}
DEPENDS ${filename}
COMMAND midl /h ${file_h} /iid ${file_c} /notlb ${CMAKE_CURRENT_SOURCE_DIR}/${filename}
COMMAND midl /h ${file_h} /iid ${file_c} ${tlb_opt} ${CMAKE_CURRENT_SOURCE_DIR}/${filename}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
else()
execute_process(COMMAND echo
@ -62,4 +70,12 @@ macro(add_idl_files generated_files)
PROPERTIES
HEADER_FILE_ONLY TRUE)
endforeach(filename ${ARGN})
endmacro(add_idl_files_base)
macro(add_idl_files generated_files)
add_idl_files_base(${generated_files} FALSE ${ARGN})
endmacro(add_idl_files)
macro(add_idl_files_with_tlb generated_files)
add_idl_files_base(${generated_files} TRUE ${ARGN})
endmacro(add_idl_files_with_tlb)

1
cmake/Modules/ObsCpack.cmake
View file

@ -8,6 +8,7 @@ endif()
set(CPACK_PACKAGE_NAME "OBS")
set(CPACK_PACKAGE_VENDOR "obsproject.com")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OBS - Live video and audio streaming and recording software")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/UI/data/license/gplv2.txt")
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "0")