New upstream version 21.0.2+dfsg1

This commit is contained in:
Sebastian Ramacher 2018-02-19 20:54:37 +01:00
parent 1f1bbb3518
commit baafb6325b
706 changed files with 49633 additions and 5044 deletions

View file

@ -122,6 +122,16 @@ file(GLOB CURL_BIN_FILES
"${CURL_INCLUDE_DIR}/bin/curl*.dll"
)
file(GLOB LUA_BIN_FILES
"${LUAJIT_INCLUDE_DIR}/../../bin${_bin_suffix}/lua*.dll"
"${LUAJIT_INCLUDE_DIR}/../../bin/lua*.dll"
"${LUAJIT_INCLUDE_DIR}/../bin${_bin_suffix}/lua*.dll"
"${LUAJIT_INCLUDE_DIR}/../bin/lua*.dll"
"${LUAJIT_INCLUDE_DIR}/bin${_bin_suffix}/lua*.dll"
"${LUAJIT_INCLUDE_DIR}/bin/lua*.dll"
"${LUAJIT_INCLUDE_DIR}/lua*.dll"
)
if (ZLIB_LIB)
GET_FILENAME_COMPONENT(ZLIB_BIN_PATH ${ZLIB_LIB} PATH)
endif()
@ -166,6 +176,7 @@ set(ALL_BASE_BIN_FILES
${FFMPEG_BIN_FILES}
${X264_BIN_FILES}
${CURL_BIN_FILES}
${LUA_BIN_FILES}
${SSL_BIN_FILES}
${ZLIB_BIN_FILES}
${LIBFDK_BIN_FILES}
@ -199,6 +210,7 @@ message(STATUS "x264 files: ${X264_BIN_FILES}")
message(STATUS "Libfdk files: ${LIBFDK_BIN_FILES}")
message(STATUS "Freetype files: ${FREETYPE_BIN_FILES}")
message(STATUS "curl files: ${CURL_BIN_FILES}")
message(STATUS "lua files: ${LUA_BIN_FILES}")
message(STATUS "ssl files: ${SSL_BIN_FILES}")
message(STATUS "zlib files: ${ZLIB_BIN_FILES}")
message(STATUS "QT Debug files: ${QT_DEBUG_BIN_FILES}")

View file

@ -0,0 +1,84 @@
# Once done these will be defined:
#
# LUAJIT_FOUND
# LUAJIT_INCLUDE_DIRS
# LUAJIT_LIBRARIES
#
# For use in OBS:
#
# LUAJIT_INCLUDE_DIR
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(_LIB_SUFFIX 64)
ELSE()
SET(_LIB_SUFFIX 32)
ENDIF()
FIND_PATH(LUAJIT_INCLUDE_DIR
NAMES lua.h lualib.h
HINTS
ENV LuajitPath${_LIB_SUFFIX}
ENV LuajitPath
ENV DepsPath${_LIB_SUFFIX}
ENV DepsPath
${LuajitPath${_LIB_SUFFIX}}
${LuajitPath}
${DepsPath${_LIB_SUFFIX}}
${DepsPath}
${_LUAJIT_INCLUDE_DIRS}
PATHS
/usr/include
/usr/local/include
/opt/local/include
/opt/local
/sw/include
~/Library/Frameworks
/Library/Frameworks
PATH_SUFFIXES
include
luajit
luajit/src
include/luajit
include/luajit/src
luajit-2.0
include/luajit-2.0
luajit2.0
include/luajit2.0
)
find_library(LUAJIT_LIB
NAMES ${_LUAJIT_LIBRARIES} luajit luajit-51 luajit-5.1 lua51
HINTS
ENV LuajitPath${_lib_suffix}
ENV LuajitPath
ENV DepsPath${_lib_suffix}
ENV DepsPath
${LuajitPath${_lib_suffix}}
${LuajitPath}
${DepsPath${_lib_suffix}}
${DepsPath}
${_LUAJIT_LIBRARY_DIRS}
PATHS
/usr/lib
/usr/local/lib
/opt/local/lib
/opt/local
/sw/lib
~/Library/Frameworks
/Library/Frameworks
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(Luajit DEFAULT_MSG LUAJIT_LIB LUAJIT_INCLUDE_DIR)
mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIB)
if(LUAJIT_FOUND)
set(LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
set(LUAJIT_LIBRARIES ${LUAJIT_LIB})
endif()

View file

@ -0,0 +1,68 @@
# Once done these will be defined:
#
# PYTHON_FOUND
# PYTHON_INCLUDE_DIRS
# PYTHON_LIBRARIES
#
# For use in OBS:
#
# PYTHON_INCLUDE_DIR
if(NOT WIN32)
set(Python_ADDITIONAL_VERSIONS 3.4)
find_package(PythonLibs QUIET 3.4)
return()
endif()
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(_LIB_SUFFIX 64)
ELSE()
SET(_LIB_SUFFIX 32)
ENDIF()
FIND_PATH(PYTHON_INCLUDE_DIR
NAMES Python.h
HINTS
ENV PythonPath${_LIB_SUFFIX}
ENV PythonPath
ENV DepsPath${_LIB_SUFFIX}
ENV DepsPath
${PythonPath${_LIB_SUFFIX}}
${PythonPath}
${DepsPath${_LIB_SUFFIX}}
${DepsPath}
${_PYTHON_INCLUDE_DIRS}
PATH_SUFFIXES
include
include/python
)
find_library(PYTHON_LIB
NAMES ${_PYTHON_LIBRARIES} python36
HINTS
ENV PythonPath${_lib_suffix}
ENV PythonPath
ENV DepsPath${_lib_suffix}
ENV DepsPath
${PythonPath${_lib_suffix}}
${PythonPath}
${DepsPath${_lib_suffix}}
${DepsPath}
${_PYTHON_LIBRARY_DIRS}
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(Python DEFAULT_MSG PYTHON_LIB PYTHON_INCLUDE_DIR)
mark_as_advanced(PYTHON_INCLUDE_DIR PYTHON_LIB)
if(PYTHON_FOUND)
set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
set(PYTHON_LIBRARIES ${PYTHON_LIB})
set(PYTHONLIBS_FOUND TRUE)
endif()

View file

@ -0,0 +1,43 @@
if(WIN32)
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(_LIB_SUFFIX 64)
ELSE()
SET(_LIB_SUFFIX 32)
ENDIF()
FIND_PATH(SWIG_DIR
NAMES swigrun.i
HINTS
ENV SwigPath${_LIB_SUFFIX}
ENV SwigPath
ENV DepsPath${_LIB_SUFFIX}
ENV DepsPath
${SwigPath${_LIB_SUFFIX}}
${SwigPath}
${DepsPath${_LIB_SUFFIX}}
${DepsPath}
${_PYTHON_INCLUDE_DIRS}
PATH_SUFFIXES
../swig/Lib
swig/Lib
)
find_program(SWIG_EXECUTABLE
NAMES swig
HINTS
ENV SwigPath${_LIB_SUFFIX}
ENV SwigPath
ENV DepsPath${_LIB_SUFFIX}
ENV DepsPath
${SwigPath${_LIB_SUFFIX}}
${SwigPath}
${DepsPath${_LIB_SUFFIX}}
${DepsPath}
${_PYTHON_INCLUDE_DIRS}
PATH_SUFFIXES
../swig
swig
)
endif()
find_package(SWIG QUIET 2)

View file

@ -60,6 +60,8 @@ if(NOT UNIX_STRUCTURE)
set(OBS_DATA_PATH "../${OBS_DATA_DESTINATION}")
set(OBS_INSTALL_PREFIX "")
set(OBS_RELATIVE_PREFIX "../")
set(OBS_SCRIPT_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-scripting/${_lib_suffix}bit")
else()
set(OBS_EXECUTABLE_DESTINATION "bin/${_lib_suffix}bit")
set(OBS_EXECUTABLE32_DESTINATION "bin/32bit")
@ -74,10 +76,14 @@ if(NOT UNIX_STRUCTURE)
set(OBS_DATA_PATH "../../${OBS_DATA_DESTINATION}")
set(OBS_INSTALL_PREFIX "")
set(OBS_RELATIVE_PREFIX "../../")
set(OBS_SCRIPT_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-scripting/${_lib_suffix}bit")
endif()
set(OBS_CMAKE_DESTINATION "cmake")
set(OBS_INCLUDE_DESTINATION "include")
set(OBS_UNIX_STRUCTURE "0")
set(OBS_SCRIPT_PLUGIN_PATH "${OBS_RELATIVE_PREFIX}${OBS_SCRIPT_PLUGIN_DESTINATION}")
else()
if(NOT OBS_MULTIARCH_SUFFIX AND DEFINED ENV{OBS_MULTIARCH_SUFFIX})
set(OBS_MULTIARCH_SUFFIX "$ENV{OBS_MULTIARCH_SUFFIX}")
@ -100,6 +106,9 @@ else()
set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
set(OBS_RELATIVE_PREFIX "../")
set(OBS_UNIX_STRUCTURE "1")
set(OBS_SCRIPT_PLUGIN_DESTINATION "${OBS_LIBRARY_DESTINATION}/obs-scripting")
set(OBS_SCRIPT_PLUGIN_PATH "${OBS_INSTALL_PREFIX}${OBS_SCRIPT_PLUGIN_DESTINATION}")
endif()
function(obs_finish_bundle)