Merge 2.4 into master

PR #2968: cce2d99 8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher

The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.

PR #3236: 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.

PR #3190
fix blobdetector

PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.

PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h

PR #3792: afdf319
Add -L for CUDA libs path to pkg-config

Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.

PR #3893: 122b9f8
Turn ocv_convert_to_lib_name into a function

PR #5490: ec5244a
fixed memory leak in findHomography tests

PR #5491: 0d5b739
delete video readers

PR #5574

PR #5202

samples/gpu/CMakeLists.txt

@@ -81,6 +81,10 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
 
   file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
 
+  if(NOT WITH_OPENGL)
+    list(REMOVE_ITEM all_samples "opengl.cpp")
+  endif(NOT WITH_OPENGL)
+
   foreach(sample_filename ${all_samples})
     get_filename_component(sample ${sample_filename} NAME_WE)
     file(GLOB sample_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${sample}.*)
@@ -92,6 +96,9 @@ endif()
 
 if(INSTALL_C_EXAMPLES AND NOT WIN32)
   file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+  if(NOT WITH_OPENGL)
+    list(REMOVE_ITEM all_samples "opengl.cpp")
+  endif(NOT WITH_OPENGL)
   install(FILES ${install_list}
           DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)

samples/gpu/opengl.cpp

@@ -1,13 +1,4 @@
 #include <iostream>
-#include "cvconfig.h"
-
-#ifndef HAVE_OPENGL
-int main()
-{
-    std::cerr << "Library was built without OpenGL support" << std::endl;
-    return -1;
-}
-#else
 
 #ifdef WIN32
     #define WIN32_LEAN_AND_MEAN 1
@@ -124,5 +115,3 @@ int main(int argc, char* argv[])
 
     return 0;
 }
-
-#endif