diff --git a/CMakeLists.txt b/CMakeLists.txt index 75d85f0..95b96b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.5) project(obs-v4l2sink) - -include(external/FindLibObs.cmake) find_package(LibObs REQUIRED) set (CMAKE_CXX_STANDARD 11) @@ -23,9 +21,6 @@ set(virtualoutput_HEADERS src/v4l2sink.h src/v4l2sinkproperties.h) -include_directories( - "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api") - add_library(v4l2sink MODULE ${virtualoutput_SOURCES} ${virtualoutput_HEADERS}) @@ -35,12 +30,6 @@ target_link_libraries(v4l2sink Qt5::Core Qt5::Widgets) -if(ARCH EQUAL 64) - set(ARCH_NAME "x86_64") -else() - set(ARCH_NAME "i686") -endif() - set_target_properties(v4l2sink PROPERTIES PREFIX "") install(TARGETS v4l2sink diff --git a/external/FindLibObs.cmake b/external/FindLibObs.cmake deleted file mode 100644 index ab0a3de..0000000 --- a/external/FindLibObs.cmake +++ /dev/null @@ -1,107 +0,0 @@ -# This module can be copied and used by external plugins for OBS -# -# Once done these will be defined: -# -# LIBOBS_FOUND -# LIBOBS_INCLUDE_DIRS -# LIBOBS_LIBRARIES - -find_package(PkgConfig QUIET) -if (PKG_CONFIG_FOUND) - pkg_check_modules(_OBS QUIET obs libobs) -endif() - -if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(_lib_suffix 64) -else() - set(_lib_suffix 32) -endif() - -if(DEFINED CMAKE_BUILD_TYPE) - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(_build_type_base "debug") - else() - set(_build_type_base "release") - endif() -endif() - -find_path(LIBOBS_INCLUDE_DIR - NAMES obs.h - HINTS - ENV obsPath${_lib_suffix} - ENV obsPath - ${obsPath} - PATHS - /usr/include /usr/local/include /opt/local/include /sw/include - PATH_SUFFIXES - libobs - ) - -function(find_obs_lib base_name repo_build_path lib_name) - string(TOUPPER "${base_name}" base_name_u) - - if(DEFINED _build_type_base) - set(_build_type_${repo_build_path} "${_build_type_base}/${repo_build_path}") - set(_build_type_${repo_build_path}${_lib_suffix} "${_build_type_base}${_lib_suffix}/${repo_build_path}") - endif() - - find_library(${base_name_u}_LIB - NAMES ${_${base_name_u}_LIBRARIES} ${lib_name} lib${lib_name} - HINTS - ENV obsPath${_lib_suffix} - ENV obsPath - ${obsPath} - ${_${base_name_u}_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 - # base repo non-msvc-specific search paths - ${_build_type_${repo_build_path}} - ${_build_type_${repo_build_path}${_lib_suffix}} - build/${repo_build_path} - build${_lib_suffix}/${repo_build_path} - # base repo msvc-specific search paths on windows - build${_lib_suffix}/${repo_build_path}/Debug - build${_lib_suffix}/${repo_build_path}/RelWithDebInfo - build/${repo_build_path}/Debug - build/${repo_build_path}/RelWithDebInfo - ) -endfunction() - -find_obs_lib(LIBOBS libobs obs) - -if(MSVC) - find_obs_lib(W32_PTHREADS deps/w32-pthreads w32-pthreads) -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Libobs DEFAULT_MSG LIBOBS_LIB LIBOBS_INCLUDE_DIR) -mark_as_advanced(LIBOBS_INCLUDE_DIR LIBOBS_LIB) - -if(LIBOBS_FOUND) - if(MSVC) - if (NOT DEFINED W32_PTHREADS_LIB) - message(FATAL_ERROR "Could not find the w32-pthreads library" ) - endif() - - set(W32_PTHREADS_INCLUDE_DIR ${LIBOBS_INCLUDE_DIR}/../deps/w32-pthreads) - endif() - - set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR}) - set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB}) - include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake) - - # allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg) - if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${LIBOBS_INCLUDE_DIR}/../cmake/Modules/") - set(INCLUDED_LIBOBS_CMAKE_MODULES true) - endif() -else() - message(FATAL_ERROR "Could not find the libobs library" ) -endif() diff --git a/src/v4l2sink.cpp b/src/v4l2sink.cpp index d964db4..8a60990 100644 --- a/src/v4l2sink.cpp +++ b/src/v4l2sink.cpp @@ -210,7 +210,7 @@ int v4l2device_open(void *data) -static bool v4l2device_close(void *data) +static void v4l2device_close(void *data) { v4l2sink_data *out_data = (v4l2sink_data*)data; close(out_data->v4l2_fd);