cmake/OpenCVModule.cmake | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 support build static libraries

modules/highgui/src/cap_libv4l.cpp | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 fix ftbfs on kfreebsd

CMakeLists.txt | 5 3 + 2 - 0 !
1 file changed, 3 insertions(+), 2 deletions(-)

 support multiarch

modules/core/src/parallel.cpp | 6 3 + 3 - 0 !
modules/core/src/system.cpp | 4 2 + 2 - 0 !
2 files changed, 5 insertions(+), 5 deletions(-)

 fix ftbfs on non linux

cmake/OpenCVGenPkgconfig.cmake | 9 7 + 2 - 0 !
1 file changed, 7 insertions(+), 2 deletions(-)

 pkg-config is broken in opencv-2.4.x
Bug: http://code.opencv.org/issues/1925
Bug-Debian: http://bugs.debian.org/721894, http://bugs.debian.org/678222 

modules/core/include/opencv2/core/core.hpp | 10 5 + 5 - 0 !
modules/core/include/opencv2/core/gpumat.hpp | 2 1 + 1 - 0 !
modules/core/include/opencv2/core/operations.hpp | 6 3 + 3 - 0 !
modules/core/src/gpumat.cpp | 2 1 + 1 - 0 !
modules/core/src/matrix.cpp | 2 1 + 1 - 0 !
modules/core/src/system.cpp | 2 1 + 1 - 0 !
modules/gpu/include/opencv2/gpu/gpu.hpp | 2 1 + 1 - 0 !
modules/python/src2/cv2.cpp | 10 5 + 5 - 0 !
8 files changed, 18 insertions(+), 18 deletions(-)

 fix ftbfs on sparc64

modules/ts/CMakeLists.txt | 11 10 + 1 - 0 !
modules/ts/include/opencv2/ts/ts.hpp | 7 7 + 0 - 0 !
2 files changed, 17 insertions(+), 1 deletion(-)

 revert commit 131458847bbf2fe971c6b5e40a8b59d0d48b0d0c
 This commit disable building shared library of TS.

cmake/OpenCVDetectOpenCL.cmake | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix path of opencl header file. this patch modified can be set
by OPENCL_INCLUDE_DIR option for path of the header file of OpenCL.
Bug: None
Bug-Debian: None

modules/highgui/src/cap_ffmpeg_impl.hpp | 349 63 + 286 - 0 !
1 file changed, 63 insertions(+), 286 deletions(-)

 support building with the upcoming libav 10 release