New upstream version 26.0.0+dfsg1

This commit is contained in:
Sebastian Ramacher 2020-10-01 22:15:25 +02:00
parent 8e020cdacb
commit 240080891f
837 changed files with 41275 additions and 9196 deletions

View file

@ -5,13 +5,14 @@ if(DISABLE_VLC)
return()
endif()
find_package(LibVLC QUIET)
if(NOT LIBVLC_INCLUDES_FOUND AND ENABLE_VLC)
message(FATAL_ERROR "LibVLC includes not found but set as enabled")
elseif(NOT LIBVLC_INCLUDES_FOUND)
message(STATUS "LibVLC includes not found, VLC video plugin disabled")
return()
if(ENABLE_VLC)
find_package(LibVLC REQUIRED)
else()
find_package(LibVLC)
if(NOT LibVLC_FOUND)
message(STATUS "VLC video plugin disabled")
return()
endif()
endif()
include_directories(${LIBVLC_INCLUDE_DIRS})
@ -41,8 +42,10 @@ endif()
add_library(vlc-video MODULE
${vlc-video_SOURCES}
${vlc-video_HEADERS})
# instead of linking vlc we load at runtime.
target_link_libraries(vlc-video
libobs
${vlc-video_PLATFORM_DEPS})
set_target_properties(vlc-video PROPERTIES FOLDER "plugins")
install_obs_plugin_with_data(vlc-video data)