package/opencv: re-introduce opencv for opencv-2.4

	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"

	source "package/libva-intel-driver/Config.in"

	source "package/libvips/Config.in"

	source "package/menu-cache/Config.in"

	source "package/opencv/Config.in"

	source "package/opencv3/Config.in"

	source "package/opengl/Config.in"

	source "package/openjpeg/Config.in"

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

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

From eceada586bbf18fc267e437522ec4f1f23ddc656 Mon Sep 17 00:00:00 2001

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

Date: Fri, 3 Oct 2014 00:32:40 +0200

Subject: [PATCH] cmake/OpenCVGenPkgconfig.cmake: rework opencv.pc generation

Using absolute path to locate the components in the "Libs:" field of the

*.pc can badly break cross-compilation, especially when building

statically linked objects.

Indeed, pkg-config automatically replaces the '-I...' and '-L...' paths

when the PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR environment

variables are set [1]. This feature is very helpful and common in

cross-compilation framework like Buildroot [2,3].

When there are absolute paths in the *.pc files, pkg-config won't be

able to do the path substitions for these paths when the afromentioned

environment variables are set.

In such case, since the prefix is the target one, not the sysroot one,

these libraries' abolute paths will point to:

- in the best case: a non-existing file (i.e. these files do not exists

  on the host system;

- at worst: the host system's libraries. This will make the linking

  failed because these host system's libraries will most likely not be

  build for the target architecture [4].

So, this patch replace the components' absolute paths by the form:

  -L<libdir> -l<libname>

This way, the linker will be able to resolve each dependency path,

whatever the kind of objects/build (shared object or static build) it

is dealing with.

Note that for static link, the library order does matter [5]. The order

of the opencv components has been carefully chosen to comply with this

requirement.

Fixes #3931

[1] http://linux.die.net/man/1/pkg-config

[2] http://buildroot.org/

[3] http://git.buildroot.net/buildroot/tree/package/pkgconf/pkg-config.in

[4] http://autobuild.buildroot.net/results/e8a/e8a859276db34aff87ef181b0cce98916b0afc90/build-end.log

[5] http://stackoverflow.com/questions/45135/linker-order-gcc

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

---

Note: this patch properly applies on top of the master branch, though it

      has been written on top of the 2.4 branch.

---

 cmake/OpenCVGenPkgconfig.cmake | 64 +++++++++++++++++++++++++++---------------

 1 file changed, 42 insertions(+), 22 deletions(-)

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

index fa57db9..183c56d 100644

--- a/cmake/OpenCVGenPkgconfig.cmake

+++ b/cmake/OpenCVGenPkgconfig.cmake

@@ -8,10 +8,6 @@

 #

 # ${BIN_DIR}/unix-install/opencv.pc -> For use *with* "make install"

 # -------------------------------------------------------------------------------------------

-set(prefix      "${CMAKE_INSTALL_PREFIX}")

-set(exec_prefix "\${prefix}")

-set(libdir      "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS

-set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")

 if(CMAKE_BUILD_TYPE MATCHES "Release")

   set(ocv_optkind OPT)

@@ -35,42 +31,66 @@ ocv_list_reverse(OpenCV_LIB_COMPONENTS)

 ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)

 #build the list of components

-set(OpenCV_LIB_COMPONENTS_ "")

-foreach(CVLib ${OpenCV_LIB_COMPONENTS})

-  get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})

-  get_filename_component(libname "${libpath}" NAME)

-  if(INSTALL_TO_MANGLED_PATHS)

-    set(libname "${libname}.${OPENCV_VERSION}")

-  endif()

+# Note:

+#   when linking against static libraries, if libfoo depends on libbar, then

+#   libfoo must come first in the linker flags.

+

+# world is a special target whose library should come first, especially for

+# static link.

+if(OpenCV_LIB_COMPONENTS MATCHES "opencv_world")

+  list(REMOVE_ITEM OpenCV_LIB_COMPONENTS "opencv_world")

+  list(INSERT OpenCV_LIB_COMPONENTS 0 "opencv_world")

+endif()

+

+set(OpenCV_LIB_COMPONENTS_)

+foreach(CVLib ${OpenCV_LIB_COMPONENTS})

-  #need better solution....

-  if(libpath MATCHES "3rdparty")

-    set(installDir "share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}")

+  get_target_property(libloc ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})

+  if(libloc MATCHES "3rdparty")

+    set(libpath "\${exec_prefix}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}")

   else()

-    set(installDir "${OPENCV_LIB_INSTALL_PATH}")

+    set(libpath "\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}")

   endif()

+  list(APPEND OpenCV_LIB_COMPONENTS_ "-L${libpath}")

+

+  get_filename_component(libname ${CVLib} NAME_WE)

+  string(REGEX REPLACE "^lib" "" libname "${libname}")

+  list(APPEND OpenCV_LIB_COMPONENTS_ "-l${libname}")

-  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")

 endforeach()

 # add extra dependencies required for OpenCV

-set(OpenCV_LIB_COMPONENTS ${OpenCV_LIB_COMPONENTS_})

 if(OpenCV_EXTRA_COMPONENTS)

   foreach(extra_component ${OpenCV_EXTRA_COMPONENTS})

-    if(extra_component MATCHES "^-[lL]" OR extra_component MATCHES "[\\/]")

-      set(maybe_l_prefix "")

+    if(extra_component MATCHES "^-[lL]")

+      set(libprefix "")

+      set(libname "${extra_component}")

+    elseif(extra_component MATCHES "[\\/]")

+      get_filename_component(libdir "${extra_component}" PATH)

+      list(APPEND OpenCV_LIB_COMPONENTS_ "-L${libdir}")

+      get_filename_component(libname "${extra_component}" NAME_WE)

+      string(REGEX REPLACE "^lib" "" libname "${libname}")

+      set(libprefix "-l")

     else()

-      set(maybe_l_prefix "-l")

+      set(libprefix "-l")

+      set(libname "${extra_component}")

     endif()

-

-    set(OpenCV_LIB_COMPONENTS "${OpenCV_LIB_COMPONENTS} ${maybe_l_prefix}${extra_component}")

+    list(APPEND OpenCV_LIB_COMPONENTS_ "${libprefix}${libname}")

   endforeach()

 endif()

+list(REMOVE_DUPLICATES OpenCV_LIB_COMPONENTS_)

+string(REPLACE ";" " " OpenCV_LIB_COMPONENTS "${OpenCV_LIB_COMPONENTS_}")

+

 #generate the .pc file

+set(prefix      "${CMAKE_INSTALL_PREFIX}")

+set(exec_prefix "\${prefix}")

+set(libdir      "\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}")

+set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")

+

 if(INSTALL_TO_MANGLED_PATHS)

   set(OPENCV_PC_FILE_NAME "opencv-${OPENCV_VERSION}.pc")

 else()

-- 

2.4.1