Commit Graph

25 Commits

Author SHA1 Message Date
Vicente Olivert Riera
a3fe0fe73d opencv: highgui module is needed for ts module
OpenCV's highgui module needs to be auto-selected when the ts module is
selected, because it depends on it. Otherwise it would fail with an
error like this one:

[ 96%] Building CXX object
modules/ts/CMakeFiles/opencv_ts.dir/src/gpu_perf.cpp.o
In file included from
/home/test/autobuild/instance-1/output/build/opencv-2.4.8/modules/ts/src/gpu_perf.cpp:43:0:
/home/test/autobuild/instance-1/output/build/opencv-2.4.8/modules/ts/include/opencv2/ts/gpu_perf.hpp:47:39:
fatal error: opencv2/highgui/highgui.hpp: No such file or directory
compilation terminated.

Fixes:
  http://autobuild.buildroot.net/results/31b/31b124ff1ec958a621863bfc80323847a6373135/

Issue reported upstream:
  http://code.opencv.org/issues/3923

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-26 21:14:40 +02:00
Samuel Martin
547b3bb337 opencv: rework V4L/libv4l support
Starting with the 2.4.7 release, for V4L support, OpenCV does not
requires a libv4l dependency for its V4L support.

So, it now provides 2 distincts knobs for this: WITH_V4L and a new
one: WITH_LIBV4L.

This patch takes advantage of this new knob and libv4l support is
now automatically enabled only if the libv4l package is enabled.

In OpenCV, the logic behind this is:
- using libv4l if available,
- otherwise, use v4l2 or v4l API from the kernel if available.

[Thomas: remove gratuituous reformating, as suggested by Yann.]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-21 22:46:52 +02:00
Yann E. MORIN
68e1083b9d package/opencv: fix dependencies for the Qt and GTK backends
Only the highgui module can use Qt or GTK (as noticed by Thomas.)

However, it is currently possible to select the Qt or the GTK backends
support independently of highgui, thus breaking the configuration step
of opencv.

Just hide the Qt and GTK backends when highgui is not selected.

Fixes:
    http://autobuild.buildroot.org/results/efc/efc9590a193235701fee535f4a1da7b39c426665/
    http://autobuild.buildroot.org/results/b6a/b6acd983b8c78005feef6864af469bd348ab742a/

[Thomas: remove 'if BR2_PACKAGE_OPENCV_LIB_HIGHGUI' statements since
BR2_PACKAGE_OPENCV_WITH_QT now depends on
BR2_PACKAGE_OPENCV_LIB_HIGHGUI]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-20 11:53:40 +02:00
Thomas Petazzoni
26043fdbf0 opencv: since 2.4.8 bump, requires NPTL
The core module of OpenCV is now using the pthread_spin_*() API, which
is only available in the 'linuxthreads' and 'NPTL' thread
implementations, but not in the 'linuxthreads.old'
implementation. Therefore, this commit adds a dependency on OpenCV to
NPTL threads.

Fixes:

  http://autobuild.buildroot.org/results/75d/75db3827ec4be8a3805508a22b8b6a4d1a3b9ce3/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-18 10:07:26 +02:00
Samuel Martin
cff18c2f34 opencv: add jasper support
[Thomas: adjust Config.in help text as suggested by Yann E. Morin.]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-16 22:59:03 +02:00
Samuel Martin
984c06cffc opencv: add superres module knob
This new module has been introduced in opencv-2.4.8.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-16 22:55:55 +02:00
Samuel Martin
d16c466959 opencv: bump to version 2.4.8
This patch bumps OpenCV version and address the minimal set of change to
get the new version building correctly:
- update the download location;
- force Qt version to Qt 4 when support is enabled;
- naively fix the v4l support.

However, it does not address a couple improvements, among these:
- jasper support;
- python/numpy support;
- Qt4 and Qt5 support (since the 2.4.6 release), so only Qt4 support is
  supported in this patch;
- optional libv4l dependency (since 2.4.7 release);
- etc.
These will be addressed in followup patches.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-16 22:51:19 +02:00
Gustavo Zacarias
c3e412f72e libv4l: needs mmu
Fixes:
http://autobuild.buildroot.net/results/989/989d32f3532283817e9439aa78cceff5983dc421/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-22 11:09:58 +02:00
Samuel Martin
2b41d31c34 opencv: fix qt selection when highgui is enable
The OpenCV highgui module links against QtGui and QtTest.
The latter is built by default but was never installed.
Thanks to the previous patch on Qt, this can be rectified.

So, update the OpenCV Config.in with the missing Qt module selection.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-03 23:06:42 +02:00
Thomas Petazzoni
da02c35278 opencv: add missing dependency on !MMU for gtk support
libgtk2 depends on !MMU, so when OpenCV selects Gtk, it should
propagate this dependency.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-24 09:01:52 +01:00
Thomas De Schampheleire
8bb561444b qt: needs MMU (fork)
Fixes
http://autobuild.buildroot.net/results/4f7/4f744595efceba2d5a54151bf5f1802eb1268fac/

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-23 20:51:10 +01:00
Arnout Vandecappelle
b536ee6069 opencv: add missing indirect dependency from gstreamer
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-20 19:21:05 +01:00
Samuel Martin
e78d357551 opencv: always enable opencv_core module when opencv is enabled
It does not make much sense enabling opencv without its core module.

This configuration leads to build nothing (since all modules depend on
the core one), but install the configuration files (*.pc and *.cmake)
anyway.

This absurd situation may break the build-system of other packages
that would correctly find the *.pc (but does not check for the modules
they actually use), but would not build because of missing headers and
libraries.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-16 09:17:57 +01:00
Peter Korsgaard
b83d57211b Revert "opencv: cleanup depends and comments"
This reverts commit 5f7cbb264e.

Buildroot policy is to keep the dependencies / comments for sub options in
case the package in the future no longer has those dependencies.

See http://lists.busybox.net/pipermail/buildroot/2014-February/088523.html
for details.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-06 23:16:48 +01:00
Samuel Martin
5f7cbb264e opencv: cleanup depends and comments
Since the opencv package globally depends on BR2_TOOLCHAIN_HAS_THREADS
and BR2_USE_WCHAR, then cleanup these redundant (and useless)
dependencies in the opencv's sub-options.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-05 23:33:41 +01:00
Samuel Martin
d5c24ee3cd opencv: need threads support
Because the opencv_core module needs threads support, just globally
disable the whole opencv package if the toolchain does not offer this
support.

Fixes:
  http://autobuild.buildroot.org/results/8dd/8dd1674674018a931ba09cc5b414c32360e51692/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-05 23:32:56 +01:00
Thomas De Schampheleire
66bb10b7b0 Config.in files: unify comments of toolchain option dependencies
This patch lines up the comments in Config.in files that clarify which
toolchain options the package depends on.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-14 22:45:57 +02:00
Gustavo Zacarias
4807cdf8a9 opencv: gtk support doesn't work with directfb
This was dropped on 4b3d949b8a when
libgkt2 was updated. Fixes:
http://autobuild.buildroot.net/results/817/8173b7fd3d6af79a7f2c04bf36059a4429127516/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-13 10:16:58 +02:00
Spenser Gilliland
51788521b7 libglib2: needs threads
This commit adds a dependency of the libglib2 package on thread
support in the toolchain, since upstream libglib2 doesn't build
without thread support. The commit is rather large as it involves
propagating the dependency on thread support to all reverse
dependencies of the libglib2 package.

[Thomas: squash all patches into one, make a few minor fixes, the most
important one being to not add comments about MMU requirement when a
package doesn't work on !MMU platforms.]

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
2013-07-27 17:13:37 +02:00
Gustavo Zacarias
416a405d60 qt: broken on avr32
Qt is broken for the avr32 architecture since it lacks TLS support.
Fixes:
http://autobuild.buildroot.net/results/56d/56d1d8f12a847f1ba49547a51d7a3605755a0bb8/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-27 19:39:45 +02:00
Thomas Petazzoni
eb71e79f41 libv4l: needs thread support
Fixes:

  http://autobuild.buildroot.org/results/c74/c741ca445a63ce9ab8b0e5b87f3126d7b6051009/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-28 23:35:19 +02:00
Peter Korsgaard
97387cda09 gstreamer: needs threads support in toolchain
Indirectly fixes http://autobuild.buildroot.net/results/453ac64daf384702512ac68f1779f375e337332d/build-end.log

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-03 12:47:54 +02:00
Samuel Martin
0ff3d3d471 opencv: bump to version 2.4.2
Update Config.in and .mk according to the new features.

Remove the patch handling build with uclibc without long double support,
which seems not necessary anymore.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 11:12:54 +02:00
Peter Korsgaard
c83738b2a4 opencv: ffmpeg supports needs largefile / ipv6
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-11-19 22:40:33 +01:00
Samuel Martin
0ca7b72668 package: add opencv
OpenCV is a free, open-source, cross-platform computer vision library

[Peter: fix deps, misc cleanup]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-10-24 15:36:21 +02:00