Commit a9043951 authored by Samuel Martin's avatar Samuel Martin Committed by Thomas Petazzoni
Browse files

package/opencv: bump to version 3.0 

This major version bump is in fact a bump from 2.4.10 to 2.4.11, then to
3.0.

OpenCV-2.4.11 improves a lot the Buildroot integration, including a
couple of patches that are no longer needed:
- x86 PIC code compilation fix in core module [1];
- return type fix in superes module [2];
- opencv.pc generation [3].

It also improves the gstreamer-0.10/1.x detection [4], that will be
needed in a follow-up patch.

OpenCV-3.0 still requires 2 patches (backported from upstream fixing
pthread support [5,6].

The OpenCV-3.0 does some major changes, for which a transition guide
has been published [7].

Among these changes coming with OpenCV-3.0, some new modules have been
introduced and others got removed; leading to a bunch of configure
option updates (to keep as much as possible an iso-functional-perimeter)
and the legacy menu has been updated too.
The worth noticing removals being:
- the opencv_legacy and opencv_nonfree modules no longer exist;
- the opencv_contrib module has moved out of the opencv base tree and
  now has its own repository [8].
  There is currently no plan to support it.

Some 3rd-party supports have been improved or added; their integrations
in Buildroot will be addressed in follow-up patches.

[1] https://github.com/Itseez/opencv/commit/ea50be0529c248961e1b66293f8a9e4b807294a6
[2] https://github.com/Itseez/opencv/commit/2e393ab83362743ba1825ad4b31d4a2925c606b4
[3] https://github.com/Itseez/opencv/commit/eceada586bbf18fc267e437522ec4f1f23ddc656
[4] https://github.com/Itseez/opencv/commit/38bb0db9dbec08666c8a64b3e4ead8fadf15c980
[5] https://github.com/Itseez/opencv/commit/1f983ec39c97298b0c8ce409a1cc229ecf14e55c
[6] https://github.com/Itseez/opencv/commit/a482dcce464acbd5368fb93c6c3d52ba8401776a
[7] http://docs.opencv.org/master/db/dfa/tutorial_transition_guide.html
[8] https://github.com/itseez/opencv_contrib



[Thomas:
  - address most contents made by Yann E. Morin on the Config.in file.]

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarSamuel Martin <s.martin49@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent bf00b5a9

Config.in.legacy

+32 −0
Original line number Diff line number Diff line
@@ -113,6 +113,38 @@ config BR2_TARGET_UBOOT_NETWORK 
	help

	  U-Boot's custom network settings options have been removed.



config BR2_PACKAGE_OPENCV_LIB_CONTRIB

	bool "opencv contrib module no longer exists"

	select BR2_LEGACY

	help

	  OpenCV >=3.0 does not come with in-tree contrib modules.



	  They have been moved out of the OpenCV base tree, into the opencv_contrib

	  repository:

	    https://github.com/Itseez/opencv_contrib



config BR2_PACKAGE_OPENCV_LIB_GPU

	bool "opencv gpu module no longer exists"

	select BR2_LEGACY

	help

	  opencv_gpu module no longer exists as is in OpenCV >=3.0.



	  It has been split into several modules prefixed with "cuda" that require

	  Cuda programming toolkit, which is not available in Buildroot. So cuda

	  modules are forcibly disabled in Buildroot.



config BR2_PACKAGE_OPENCV_LIB_LEGACY

	bool "opencv legacy module no longer exists"

	select BR2_LEGACY

	help

	  opencv_legacy module no longer exists in OpenCV >=3.0.



config BR2_PACKAGE_OPENCV_LIB_NONFREE

	bool "opencv nonfree module no longer exists"

	select BR2_LEGACY

	help

	  opencv_nonfree module no longer exists in OpenCV >=3.0.



###############################################################################

comment "Legacy options removed in 2015.05"

package/opencv/0001-Fixed-compilation-of-pthread-based-parallel_for-with-gcc-4.4.3.patch

0 → 100644
+62 −0
Original line number Diff line number Diff line 
Backport from https://github.com/Itseez/opencv/commit/1f983ec39c97298b0c8ce409a1cc229ecf14e55c



From 1f983ec39c97298b0c8ce409a1cc229ecf14e55c Mon Sep 17 00:00:00 2001

From: Maksim Shabunin <maksim.shabunin@itseez.com>

Date: Tue, 9 Jun 2015 13:59:48 +0300

Subject: [PATCH] Fixed compilation of pthread-based parallel_for with gcc

 4.4.3



Signed-off-by: Samuel Martin <s.martin49@gmail.com>

---

 modules/core/src/parallel.cpp | 12 +++++++-----

 1 file changed, 7 insertions(+), 5 deletions(-)



diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp

index b1e7567..0b593ee 100644

--- a/modules/core/src/parallel.cpp

+++ b/modules/core/src/parallel.cpp

@@ -132,8 +132,14 @@

 namespace cv

 {

     ParallelLoopBody::~ParallelLoopBody() {}

+#if defined HAVE_PTHREADS && HAVE_PTHREADS

+    void parallel_for_pthreads(const cv::Range& range, const cv::ParallelLoopBody& body, double nstripes);

+    size_t parallel_pthreads_get_threads_num();

+    void parallel_pthreads_set_threads_num(int num);

+#endif

 }

 

+

 namespace

 {

 #ifdef CV_PARALLEL_FRAMEWORK

@@ -301,7 +307,7 @@ void cv::parallel_for_(const cv::Range& range, const cv::ParallelLoopBody& body,

         }

 

 #elif defined HAVE_PTHREADS

-        void parallel_for_pthreads(const Range& range, const ParallelLoopBody& body, double nstripes);

+

         parallel_for_pthreads(range, body, nstripes);

 

 #else

@@ -361,8 +367,6 @@ int cv::getNumThreads(void)

 

 #elif defined HAVE_PTHREADS

 

-        size_t parallel_pthreads_get_threads_num();

-

         return parallel_pthreads_get_threads_num();

 

 #else

@@ -424,8 +428,6 @@ void cv::setNumThreads( int threads )

 

 #elif defined HAVE_PTHREADS

 

-    void parallel_pthreads_set_threads_num(int num);

-

     parallel_pthreads_set_threads_num(threads);

 

 #endif

-- 

2.4.4

package/opencv/0001-core-fix-x86-PIC-code-compilation.patch

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
From ea50be0529c248961e1b66293f8a9e4b807294a6 Mon Sep 17 00:00:00 2001

From: Samuel Martin <s.martin49@gmail.com>

Date: Sun, 12 Oct 2014 10:17:23 +0200

Subject: [PATCH] core: fix x86 PIC code compilation



This bug was triggered by Buildroot autobuilders [1,2], causing this

kind of failures [3,4]:



  [ 14%] Building CXX object modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o

  /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp: In function '(static initializers for /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp)':

  /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp:280:10: error: inconsistent operand constraints in an 'asm'

  make[3]: *** [modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o] Error 1



[1] http://buildroot.org/

[2] http://autobuild.buildroot.org/

[3] http://autobuild.buildroot.org/?reason=opencv-2.4.10

[4] http://autobuild.buildroot.org/results/483/4838285b25d6293a5cf0bb9eadd5040a7c75d766/build-end.log



Signed-off-by: Samuel Martin <s.martin49@gmail.com>

---

 modules/core/src/system.cpp | 5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)



diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp

index 5a970d5..e9ffdc7 100644

--- a/modules/core/src/system.cpp

+++ b/modules/core/src/system.cpp

@@ -267,14 +267,17 @@ struct HWFeatures

          : "cc"

         );

         #else

+        // We need to preserve ebx since we are compiling PIC code.

+        // This means we cannot use "=b" for the 2nd output register.

         asm volatile

         (

          "pushl %%ebx\n\t"

          "movl $7,%%eax\n\t"

          "movl $0,%%ecx\n\t"

          "cpuid\n\t"

+         "movl %%ebx,%1\n\t"

          "popl %%ebx\n\t"

-         : "=a"(cpuid_data[0]), "=b"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3])

+         : "=a"(cpuid_data[0]), "=r"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3])

          :

          : "cc"

         );

-- 

2.1.2

package/opencv/0002-fix-support-for-pthreads-parallel_for.patch

0 → 100644
+212 −0
Original line number Diff line number Diff line 
Backport from https://github.com/Itseez/opencv/commit/a482dcce464acbd5368fb93c6c3d52ba8401776a



From a482dcce464acbd5368fb93c6c3d52ba8401776a Mon Sep 17 00:00:00 2001

From: Alexander Alekhin <alexander.alekhin@itseez.com>

Date: Thu, 11 Jun 2015 16:53:07 +0300

Subject: [PATCH] fix support for pthreads parallel_for



Signed-off-by: Samuel Martin <s.martin49@gmail.com>

---

 CMakeLists.txt                         | 29 ++++++++++++++++++++++-------

 cmake/OpenCVFindLibsPerf.cmake         | 14 +++++++++-----

 cmake/templates/cvconfig.h.in          |  6 ++++++

 modules/core/src/parallel.cpp          | 13 ++++++++-----

 modules/core/src/parallel_pthreads.cpp |  2 +-

 modules/core/src/precomp.hpp           |  6 ------

 6 files changed, 46 insertions(+), 24 deletions(-)



diff --git a/CMakeLists.txt b/CMakeLists.txt

index d9a17b3..27d8470 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -188,7 +188,7 @@ OCV_OPTION(WITH_QUICKTIME      "Use QuickTime for Video I/O insted of QTKit" OFF

 OCV_OPTION(WITH_TBB            "Include Intel TBB support"                   OFF  IF (NOT IOS AND NOT WINRT) )

 OCV_OPTION(WITH_OPENMP         "Include OpenMP support"                      OFF)

 OCV_OPTION(WITH_CSTRIPES       "Include C= support"                          OFF  IF (WIN32 AND NOT WINRT)  )

-OCV_OPTION(WITH_PTHREADS_PF    "Use pthreads-based parallel_for"             OFF  IF (NOT WIN32) )

+OCV_OPTION(WITH_PTHREADS_PF    "Use pthreads-based parallel_for"             ON   IF (NOT WIN32) )

 OCV_OPTION(WITH_TIFF           "Include TIFF support"                        ON   IF (NOT IOS) )

 OCV_OPTION(WITH_UNICAP         "Include Unicap support (GPL)"                OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID) )

 OCV_OPTION(WITH_V4L            "Include Video 4 Linux support"               ON   IF (UNIX AND NOT ANDROID) )

@@ -1026,6 +1026,27 @@ if(DEFINED WITH_GPHOTO2)

 endif(DEFINED WITH_GPHOTO2)

 

 

+# Order is similar to CV_PARALLEL_FRAMEWORK in core/src/parallel.cpp

+ocv_clear_vars(CV_PARALLEL_FRAMEWORK)

+if(HAVE_TBB)

+  set(CV_PARALLEL_FRAMEWORK "TBB (ver ${TBB_VERSION_MAJOR}.${TBB_VERSION_MINOR} interface ${TBB_INTERFACE_VERSION})")

+elseif(HAVE_CSTRIPES)

+  set(CV_PARALLEL_FRAMEWORK "C=")

+elseif(HAVE_OPENMP)

+  set(CV_PARALLEL_FRAMEWORK "OpenMP")

+elseif(HAVE_GCD)

+  set(CV_PARALLEL_FRAMEWORK "GCD")

+elseif(WINRT OR HAVE_CONCURRENCY)

+  set(CV_PARALLEL_FRAMEWORK "Concurrency")

+elseif(HAVE_PTHREADS_PF)

+  set(CV_PARALLEL_FRAMEWORK "pthreads")

+else()

+  set(CV_PARALLEL_FRAMEWORK "none")

+endif()

+status("")

+status("  Parallel framework:" TRUE THEN "${CV_PARALLEL_FRAMEWORK}" ELSE NO)

+

+

 # ========================== Other third-party libraries ==========================

 status("")

 status("  Other third-party libraries:")

@@ -1045,12 +1066,6 @@ status("    Use IPP Async:"  HAVE_IPP_A       THEN "YES" ELSE NO)

 endif(DEFINED WITH_IPP_A)

 

 status("    Use Eigen:"      HAVE_EIGEN       THEN "YES (ver ${EIGEN_WORLD_VERSION}.${EIGEN_MAJOR_VERSION}.${EIGEN_MINOR_VERSION})" ELSE NO)

-status("    Use TBB:"        HAVE_TBB         THEN "YES (ver ${TBB_VERSION_MAJOR}.${TBB_VERSION_MINOR} interface ${TBB_INTERFACE_VERSION})" ELSE NO)

-status("    Use OpenMP:"     HAVE_OPENMP      THEN YES ELSE NO)

-status("    Use GCD"         HAVE_GCD         THEN YES ELSE NO)

-status("    Use Concurrency" HAVE_CONCURRENCY THEN YES ELSE NO)

-status("    Use C=:"         HAVE_CSTRIPES    THEN YES ELSE NO)

-status("    Use pthreads for parallel for:"   HAVE_PTHREADS_PF THEN YES ELSE NO)

 status("    Use Cuda:"       HAVE_CUDA        THEN "YES (ver ${CUDA_VERSION_STRING})" ELSE NO)

 status("    Use OpenCL:"     HAVE_OPENCL      THEN YES ELSE NO)

 

diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake

index bda5d79..d1bc541 100644

--- a/cmake/OpenCVFindLibsPerf.cmake

+++ b/cmake/OpenCVFindLibsPerf.cmake

@@ -120,12 +120,16 @@ if(WITH_OPENMP)

   set(HAVE_OPENMP "${OPENMP_FOUND}")

 endif()

 

-if(UNIX OR ANDROID)

-if(NOT APPLE AND NOT HAVE_TBB AND NOT HAVE_OPENMP)

-  set(HAVE_PTHREADS_PF 1)

-else()

-  set(HAVE_PTHREADS_PF 0)

+if(NOT MSVC AND NOT DEFINED HAVE_PTHREADS)

+  set(_fname "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/pthread_test.cpp")

+  file(WRITE "${_fname}" "#include <pthread.h>\nint main() { (void)pthread_self(); return 0; }\n")

+  try_compile(HAVE_PTHREADS "${CMAKE_BINARY_DIR}" "${_fname}")

+  file(REMOVE "${_fname}")

 endif()

+

+ocv_clear_vars(HAVE_PTHREADS_PF)

+if(WITH_PTHREADS_PF)

+  set(HAVE_PTHREADS_PF ${HAVE_PTHREADS})

 else()

   set(HAVE_PTHREADS_PF 0)

 endif()

diff --git a/cmake/templates/cvconfig.h.in b/cmake/templates/cvconfig.h.in

index 4a1d1c6..3330774 100644

--- a/cmake/templates/cvconfig.h.in

+++ b/cmake/templates/cvconfig.h.in

@@ -139,6 +139,12 @@

 /* PNG codec */

 #cmakedefine HAVE_PNG

 

+/* Posix threads (pthreads) */

+#cmakedefine HAVE_PTHREADS

+

+/* parallel_for with pthreads */

+#cmakedefine HAVE_PTHREADS_PF

+

 /* Qt support */

 #cmakedefine HAVE_QT

 

diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp

index 0b593ee..caa8129 100644

--- a/modules/core/src/parallel.cpp

+++ b/modules/core/src/parallel.cpp

@@ -80,6 +80,7 @@

    4. HAVE_GCD         - system wide, used automatically        (APPLE only)

    5. WINRT            - system wide, used automatically        (Windows RT only)

    6. HAVE_CONCURRENCY - part of runtime, used automatically    (Windows only - MSVS 10, MSVS 11)

+   7. HAVE_PTHREADS_PF - pthreads if available

 */

 

 #if defined HAVE_TBB

@@ -125,14 +126,14 @@

 #  define CV_PARALLEL_FRAMEWORK "winrt-concurrency"

 #elif defined HAVE_CONCURRENCY

 #  define CV_PARALLEL_FRAMEWORK "ms-concurrency"

-#elif defined HAVE_PTHREADS

+#elif defined HAVE_PTHREADS_PF

 #  define CV_PARALLEL_FRAMEWORK "pthreads"

 #endif

 

 namespace cv

 {

     ParallelLoopBody::~ParallelLoopBody() {}

-#if defined HAVE_PTHREADS && HAVE_PTHREADS

+#ifdef HAVE_PTHREADS_PF

     void parallel_for_pthreads(const cv::Range& range, const cv::ParallelLoopBody& body, double nstripes);

     size_t parallel_pthreads_get_threads_num();

     void parallel_pthreads_set_threads_num(int num);

@@ -306,7 +307,7 @@ void cv::parallel_for_(const cv::Range& range, const cv::ParallelLoopBody& body,

             Concurrency::CurrentScheduler::Detach();

         }

 

-#elif defined HAVE_PTHREADS

+#elif defined HAVE_PTHREADS_PF

 

         parallel_for_pthreads(range, body, nstripes);

 

@@ -365,7 +366,7 @@ int cv::getNumThreads(void)

         ? Concurrency::CurrentScheduler::Get()->GetNumberOfVirtualProcessors()

         : pplScheduler->GetNumberOfVirtualProcessors());

 

-#elif defined HAVE_PTHREADS

+#elif defined HAVE_PTHREADS_PF

 

         return parallel_pthreads_get_threads_num();

 

@@ -426,7 +427,7 @@ void cv::setNumThreads( int threads )

                        Concurrency::MaxConcurrency, threads-1));

     }

 

-#elif defined HAVE_PTHREADS

+#elif defined HAVE_PTHREADS_PF

 

     parallel_pthreads_set_threads_num(threads);

 

@@ -452,6 +453,8 @@ int cv::getThreadNum(void)

     return 0;

 #elif defined HAVE_CONCURRENCY

     return std::max(0, (int)Concurrency::Context::VirtualProcessorId()); // zero for master thread, unique number for others but not necessary 1,2,3,...

+#elif defined HAVE_PTHREADS_PF

+    return (int)(size_t)(void*)pthread_self(); // no zero-based indexing

 #else

     return 0;

 #endif

diff --git a/modules/core/src/parallel_pthreads.cpp b/modules/core/src/parallel_pthreads.cpp

index 8c34959..091ea2d 100644

--- a/modules/core/src/parallel_pthreads.cpp

+++ b/modules/core/src/parallel_pthreads.cpp

@@ -42,7 +42,7 @@

 

 #include "precomp.hpp"

 

-#if defined HAVE_PTHREADS && HAVE_PTHREADS

+#ifdef HAVE_PTHREADS_PF

 

 #include <algorithm>

 #include <pthread.h>

diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp

index d463126..88b60e4 100644

--- a/modules/core/src/precomp.hpp

+++ b/modules/core/src/precomp.hpp

@@ -292,12 +292,6 @@ TLSData<CoreTLSData>& getCoreTlsData();

 #define CL_RUNTIME_EXPORT

 #endif

 

-#ifndef HAVE_PTHREADS

-#if !(defined WIN32 || defined _WIN32 || defined WINCE || defined HAVE_WINRT)

-#define HAVE_PTHREADS 1

-#endif

-#endif

-

 extern bool __termination; // skip some cleanups, because process is terminating

                            // (for example, if ExitProcess() was already called)

 

-- 

2.4.4

package/opencv/0002-superres-Fix-return-type-value-VideoFrameSource_GPU.patch

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
superres: Fix return value VideoFrameSource_GPU



Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>



From 2e393ab83362743ba1825ad4b31d4a2925c606b4 Mon Sep 17 00:00:00 2001

From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Date: Mon, 27 Oct 2014 13:39:35 +0000

Subject: [PATCH] superres: Fix return value VideoFrameSource_GPU



superres module fails to compile with the following error messages:



[100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o

/opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)':

/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource'

/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int*)operator new(4ul)' from 'int*' to 'cv::Ptr<cv::superres::FrameSource>'

/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource'

/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope

/opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type]

cc1plus: some warnings being treated as errors

make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1

make[3]: *** Waiting for unfinished jobs....



This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.

---

 modules/superres/src/frame_source.cpp | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/modules/superres/src/frame_source.cpp b/modules/superres/src/frame_source.cpp

index 5f59a98..c5b2e76 100644

--- a/modules/superres/src/frame_source.cpp

+++ b/modules/superres/src/frame_source.cpp

@@ -260,7 +260,7 @@ namespace

 

 Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const string& fileName)

 {

-    return new VideoFrameSource(fileName);

+    return new VideoFrameSource_GPU(fileName);

 }

 

 #endif // HAVE_OPENCV_GPU