potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-04-19 15:43:58 +03:00
parent 1f517b8a02 3abae3c511
commit c024edb9a8
40 changed files with 332 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/cmake/detect_aravis.cmake
+1 -1
View File
@@ -1,6 +1,6 @@
# --- Aravis SDK ---
if(NOT HAVE_ARAVIS_API AND PKG_CONFIG_FOUND)
pkg_check_modules(ARAVIS aravis-0.6 QUIET)
ocv_check_modules(ARAVIS aravis-0.6 QUIET)
if(ARAVIS_FOUND)
set(HAVE_ARAVIS_API TRUE)
endif()
modules/videoio/cmake/detect_dc1394.cmake
+1 -1
View File
@@ -1,6 +1,6 @@
# --- Dc1394 ---
if(NOT HAVE_DC1394_2 AND PKG_CONFIG_FOUND)
pkg_check_modules(DC1394_2 libdc1394-2 QUIET)
ocv_check_modules(DC1394_2 libdc1394-2)
if(DC1394_2_FOUND)
set(DC1394_2_VERSION "${DC1394_2_VERSION}" PARENT_SCOPE) # informational
set(HAVE_DC1394_2 TRUE)
modules/videoio/cmake/detect_ffmpeg.cmake
+2 -13
View File
@@ -25,23 +25,12 @@ if(NOT HAVE_FFMPEG AND WIN32 AND NOT ARM AND NOT OPENCV_FFMPEG_SKIP_DOWNLOAD)
endif()
if(NOT HAVE_FFMPEG AND PKG_CONFIG_FOUND)
pkg_check_modules(FFMPEG libavcodec libavformat libavutil libswscale QUIET)
pkg_check_modules(FFMPEG_libavresample libavresample QUIET) # optional
ocv_check_modules(FFMPEG libavcodec libavformat libavutil libswscale)
if(FFMPEG_FOUND)
ocv_check_modules(FFMPEG_libavresample libavresample) # optional
if(FFMPEG_libavresample_FOUND)
list(APPEND FFMPEG_LIBRARIES ${FFMPEG_libavresample_LIBRARIES})
endif()
# rewrite libraries to absolute paths
foreach(lib ${FFMPEG_LIBRARIES})
find_library(FFMPEG_ABSOLUTE_${lib} "${lib}" PATHS "${FFMPEG_lib${lib}_LIBDIR}" "${FFMPEG_LIBRARY_DIRS}" NO_DEFAULT_PATH)
if(FFMPEG_ABSOLUTE_${lib})
list(APPEND ffmpeg_abs_libs "${FFMPEG_ABSOLUTE_${lib}}")
else()
list(APPEND ffmpeg_abs_libs "${lib}")
endif()
endforeach()
set(FFMPEG_LIBRARIES "${ffmpeg_abs_libs}" CACHE INTERNAL "" FORCE)
set(HAVE_FFMPEG TRUE)
endif()
endif()
modules/videoio/cmake/detect_gphoto.cmake
+1 -1
View File
@@ -1,6 +1,6 @@
# --- gPhoto2 ---
if(NOT HAVE_GPHOTO2 AND PKG_CONFIG_FOUND)
pkg_check_modules(GPHOTO2 libgphoto2 QUIET)
ocv_check_modules(GPHOTO2 libgphoto2)
if(GPHOTO2_FOUND)
set(HAVE_GPHOTO2 TRUE)
endif()
modules/videoio/cmake/detect_gstreamer.cmake
+4 -4
View File
@@ -82,10 +82,10 @@ if(NOT HAVE_GSTREAMER AND WIN32)
endif()
if(NOT HAVE_GSTREAMER AND PKG_CONFIG_FOUND)
pkg_check_modules(GSTREAMER_base gstreamer-base-1.0 QUIET)
pkg_check_modules(GSTREAMER_app gstreamer-app-1.0 QUIET)
pkg_check_modules(GSTREAMER_riff gstreamer-riff-1.0 QUIET)
pkg_check_modules(GSTREAMER_pbutils gstreamer-pbutils-1.0 QUIET)
ocv_check_modules(GSTREAMER_base gstreamer-base-1.0)
ocv_check_modules(GSTREAMER_app gstreamer-app-1.0)
ocv_check_modules(GSTREAMER_riff gstreamer-riff-1.0)
ocv_check_modules(GSTREAMER_pbutils gstreamer-pbutils-1.0)
if(GSTREAMER_base_FOUND AND GSTREAMER_app_FOUND AND GSTREAMER_riff_FOUND AND GSTREAMER_pbutils_FOUND)
set(HAVE_GSTREAMER TRUE)
set(GSTREAMER_VERSION ${GSTREAMER_base_VERSION} PARENT_SCOPE) # informational
modules/videoio/cmake/detect_xine.cmake
+1 -4
View File
@@ -1,8 +1,5 @@
if(NOT HAVE_XINE AND PKG_CONFIG_FOUND)
pkg_check_modules(XINE libxine QUIET)
if(XINE_FOUND)
set(HAVE_XINE TRUE)
endif()
ocv_check_modules(XINE libxine QUIET)
endif()
if(HAVE_XINE)
modules/videoio/cmake/plugin.cmake
+1
View File
@@ -1,5 +1,6 @@
#=============================================
# build with OpenCV
include("${OpenCV_SOURCE_DIR}/cmake/OpenCVUtils.cmake")
function(ocv_create_builtin_videoio_plugin name target videoio_src_file)