New upstream version 23.2.1+dfsg1
This commit is contained in:
parent
cdc9a9fc87
commit
b14f9eae6d
1017 changed files with 37232 additions and 11111 deletions
2
deps/ipc-util/CMakeLists.txt
vendored
2
deps/ipc-util/CMakeLists.txt
vendored
|
|
@ -23,7 +23,7 @@ else()
|
|||
endif()
|
||||
|
||||
if(MSVC)
|
||||
add_compile_options("$<$<CONFIG:RelWithDebInfo>:/MT>")
|
||||
add_compile_options($<IF:$<CONFIG:Debug>,/MTd,/MT> /Zl)
|
||||
endif()
|
||||
|
||||
add_library(ipc-util STATIC
|
||||
|
|
|
|||
7
deps/media-playback/CMakeLists.txt
vendored
7
deps/media-playback/CMakeLists.txt
vendored
|
|
@ -22,7 +22,12 @@ add_library(media-playback STATIC
|
|||
${media-playback_SOURCES}
|
||||
)
|
||||
|
||||
if(NOT MSVC)
|
||||
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
|
||||
target_compile_options(media-playback
|
||||
PUBLIC
|
||||
-mvsx)
|
||||
add_compile_definitions(NO_WARN_X86_INTRINSICS)
|
||||
elseif(NOT MSVC)
|
||||
target_compile_options(media-playback
|
||||
PUBLIC
|
||||
-mmmx
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ static enum AVPixelFormat closest_format(enum AVPixelFormat fmt)
|
|||
switch (fmt) {
|
||||
case AV_PIX_FMT_YUYV422:
|
||||
return AV_PIX_FMT_YUYV422;
|
||||
case AV_PIX_FMT_YUV444P:
|
||||
return AV_PIX_FMT_YUV444P;
|
||||
|
||||
case AV_PIX_FMT_YUV422P:
|
||||
case AV_PIX_FMT_YUVJ422P:
|
||||
|
|
|
|||
1
deps/media-playback/media-playback/media.c
vendored
1
deps/media-playback/media-playback/media.c
vendored
|
|
@ -34,6 +34,7 @@ static inline enum video_format convert_pixel_format(int f)
|
|||
case AV_PIX_FMT_YUV420P: return VIDEO_FORMAT_I420;
|
||||
case AV_PIX_FMT_NV12: return VIDEO_FORMAT_NV12;
|
||||
case AV_PIX_FMT_YUYV422: return VIDEO_FORMAT_YUY2;
|
||||
case AV_PIX_FMT_YUV444P: return VIDEO_FORMAT_I444;
|
||||
case AV_PIX_FMT_UYVY422: return VIDEO_FORMAT_UYVY;
|
||||
case AV_PIX_FMT_RGBA: return VIDEO_FORMAT_RGBA;
|
||||
case AV_PIX_FMT_BGRA: return VIDEO_FORMAT_BGRA;
|
||||
|
|
|
|||
75
deps/obs-scripting/CMakeLists.txt
vendored
75
deps/obs-scripting/CMakeLists.txt
vendored
|
|
@ -1,6 +1,7 @@
|
|||
cmake_minimum_required(VERSION 2.8)
|
||||
|
||||
if(NOT ENABLE_SCRIPTING)
|
||||
message(STATUS "Scripting plugin disabled")
|
||||
return()
|
||||
endif()
|
||||
|
||||
|
|
@ -11,13 +12,54 @@ if(MSVC)
|
|||
w32-pthreads)
|
||||
endif()
|
||||
|
||||
find_package(Luajit QUIET)
|
||||
find_package(PythonDeps QUIET)
|
||||
find_package(SwigDeps QUIET 2)
|
||||
option(DISABLE_LUA "Disable Lua scripting support" OFF)
|
||||
option(DISABLE_PYTHON "Disable Python scripting support" OFF)
|
||||
|
||||
set(COMPILE_PYTHON FALSE CACHE BOOL "" FORCE)
|
||||
set(COMPILE_LUA FALSE CACHE BOOL "" FORCE)
|
||||
|
||||
if(NOT DISABLE_LUA)
|
||||
find_package(Luajit QUIET)
|
||||
|
||||
if(NOT DISABLE_LUA AND NOT LUAJIT_FOUND)
|
||||
message(STATUS "Luajit support not found.")
|
||||
set(LUAJIT_FOUND FALSE)
|
||||
else()
|
||||
message(STATUS "Scripting: Luajit supported")
|
||||
set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "Scripting: Luajit support disabled")
|
||||
set(LUAJIT_FOUND FALSE)
|
||||
endif()
|
||||
|
||||
if(NOT DISABLE_PYTHON)
|
||||
find_package(PythonDeps QUIET)
|
||||
|
||||
if(NOT DISABLE_PYTHON AND NOT PYTHONLIBS_FOUND)
|
||||
message(STATUS "Python support not found.")
|
||||
set(PYTHON_FOUND FALSE)
|
||||
set(PYTHONLIBS_FOUND FALSE)
|
||||
else()
|
||||
message(STATUS "Scripting: Python 3 supported")
|
||||
set(PYTHON_FOUND TRUE)
|
||||
set(COMPILE_PYTHON TRUE CACHE BOOL "" FORCE)
|
||||
|
||||
get_filename_component(PYTHON_LIB "${PYTHON_LIBRARIES}" NAME)
|
||||
string(REGEX REPLACE "\\.[^.]*$" "" PYTHON_LIB ${PYTHON_LIB})
|
||||
|
||||
if(WIN32)
|
||||
string(REGEX REPLACE "_d" "" PYTHON_LIB "${PYTHON_LIB}")
|
||||
endif()
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "Scripting: Python 3 support disabled")
|
||||
set(PYTHON_FOUND FALSE)
|
||||
set(PYTHONLIBS_FOUND FALSE)
|
||||
endif()
|
||||
|
||||
find_package(SwigDeps QUIET 2)
|
||||
|
||||
if(NOT SWIG_FOUND)
|
||||
message(STATUS "Scripting: SWIG not found; scripting disabled")
|
||||
return()
|
||||
|
|
@ -28,29 +70,6 @@ if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
|
|||
return()
|
||||
endif()
|
||||
|
||||
if(NOT LUAJIT_FOUND)
|
||||
message(STATUS "Scripting: Luajit not found; Luajit support disabled")
|
||||
else()
|
||||
message(STATUS "Scripting: Luajit supported")
|
||||
set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
|
||||
endif()
|
||||
|
||||
if(NOT PYTHONLIBS_FOUND)
|
||||
message(STATUS "Scripting: Python 3 not found; Python support disabled")
|
||||
set(PYTHON_FOUND FALSE)
|
||||
set(PYTHONLIBS_FOUND FALSE)
|
||||
else()
|
||||
message(STATUS "Scripting: Python 3 supported")
|
||||
set(PYTHON_FOUND TRUE)
|
||||
set(COMPILE_PYTHON TRUE CACHE BOOL "" FORCE)
|
||||
|
||||
get_filename_component(PYTHON_LIB "${PYTHON_LIBRARIES}" NAME)
|
||||
string(REGEX REPLACE "\\.[^.]*$" "" PYTHON_LIB ${PYTHON_LIB})
|
||||
if(WIN32)
|
||||
string(REGEX REPLACE "_d" "" PYTHON_LIB "${PYTHON_LIB}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set(SCRIPTING_ENABLED ON CACHE BOOL "Interal global cmake variable" FORCE)
|
||||
|
||||
if(UI_ENABLED)
|
||||
|
|
@ -58,6 +77,10 @@ if(UI_ENABLED)
|
|||
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/UI/obs-frontend-api")
|
||||
endif()
|
||||
|
||||
IF(BUILD_CAPTIONS)
|
||||
string(TOUPPER "${BUILD_CAPTIONS}" BUILD_CAPTIONS)
|
||||
endif()
|
||||
|
||||
configure_file(
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/obs-scripting-config.h.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/obs-scripting-config.h")
|
||||
|
|
|
|||
1
deps/obs-scripting/obs-scripting-config.h.in
vendored
1
deps/obs-scripting/obs-scripting-config.h.in
vendored
|
|
@ -21,3 +21,4 @@
|
|||
#define COMPILE_LUA @LUAJIT_FOUND@
|
||||
#define COMPILE_PYTHON @PYTHON_FOUND@
|
||||
#define UI_ENABLED @UI_ENABLED@
|
||||
#define BUILD_CAPTIONS @BUILD_CAPTIONS@
|
||||
|
|
|
|||
2
deps/obs-scripting/obslua/obslua.i
vendored
2
deps/obs-scripting/obslua/obslua.i
vendored
|
|
@ -84,6 +84,7 @@ static inline void wrap_blog(int log_level, const char *message)
|
|||
%include "graphics/vec2.h"
|
||||
%include "graphics/quat.h"
|
||||
%include "graphics/image-file.h"
|
||||
%include "obs-scripting-config.h"
|
||||
%include "obs-data.h"
|
||||
%include "obs-source.h"
|
||||
%include "obs-properties.h"
|
||||
|
|
@ -95,7 +96,6 @@ static inline void wrap_blog(int log_level, const char *message)
|
|||
%include "callback/signal.h"
|
||||
%include "util/bmem.h"
|
||||
%include "util/base.h"
|
||||
%include "obs-scripting-config.h"
|
||||
|
||||
#if UI_ENABLED
|
||||
%include "obs-frontend-api.h"
|
||||
|
|
|
|||
2
deps/obs-scripting/obspython/obspython.i
vendored
2
deps/obs-scripting/obspython/obspython.i
vendored
|
|
@ -82,6 +82,7 @@ static inline void wrap_blog(int log_level, const char *message)
|
|||
%include "graphics/vec3.h"
|
||||
%include "graphics/vec2.h"
|
||||
%include "graphics/quat.h"
|
||||
%include "obs-scripting-config.h"
|
||||
%include "obs-data.h"
|
||||
%include "obs-source.h"
|
||||
%include "obs-properties.h"
|
||||
|
|
@ -93,7 +94,6 @@ static inline void wrap_blog(int log_level, const char *message)
|
|||
%include "callback/signal.h"
|
||||
%include "util/bmem.h"
|
||||
%include "util/base.h"
|
||||
%include "obs-scripting-config.h"
|
||||
|
||||
#if UI_ENABLED
|
||||
%include "obs-frontend-api.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue