17 Commits

Author SHA1 Message Date
Khem Raj 4e3362f9c2 opencv: Update SRC_URI to use git
opencv now has moved to using git. Lets use the git
version to fetch SRCs

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-03-30 00:36:21 +02:00
Martin Jansa a45830a39b recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
  tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
  tabs is the need to update a lot of recipes). Lately this advice
  was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
  error prone when someone is not sure if e.g.
  do_generate_toolchain_file() is Python or shell task and also allows
  to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
  potentially bad (shouldn't be used for indenting of multiline
  variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
  we're quite inconsistent wheater it's first character on line
  under opening quote or under first non-whitespace character in
  previous line.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
2013-04-15 16:23:17 +02:00
Koen Kooi 6663d9c05e opencv: switch to out-of-tree builds
This eliminates a few warnings from the configure step and makes sense in general.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-03-21 22:01:08 +01:00
Koen Kooi 193c4ad89c opencv: enable SSE1/2/3 and SSSE3 when finding '-msse3' in TARGET_CC_ARCH
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-03-21 22:01:07 +01:00
Stefan Herbrechtsmeier 6335366c1f opencv: fix pkg-config file generation
Replace absolute library path with library name spec and library search
path option in pkg-config file.

Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-19 17:48:16 +01:00
Stefan Herbrechtsmeier 3fd3b8153d opencv: update to 2.4.3 and fix some issues
* Update opencv and opencv-samples to 2.4.3
* Use tar instead of no longer available SVN repository
* Remove numpy detection patch and update related CMAKE variable
* Fix QA Issues: contains probably-redundant RPATH
* Add PACKAGES_DYNAMIC for split library packages

Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-11-27 12:44:40 +01:00
Paul Eggleton 3a30c56238 Replace bb.data.* with d.*
Used sed expression given here:

http://lists.linuxtogo.org/pipermail/openembedded-core/2011-November/012373.html

Plus an additional expression for .expand. Full expression is:

sed \
-e 's:bb.data.\(setVar([^,]*,[^,]*\), \([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,]*,[^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,]*\), \([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(expand([^,]*\), \([^ )]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`

Some minor correction in systemd.bbclass was needed for some expressions
that didn't quite match the regex in the desired way; additionally a few
instances were manually changed.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-28 14:32:06 +00:00
Otavio Salvador 68f0544333 opencv: bump PR due libav update
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-10-05 11:27:25 +02:00
Martin Jansa 5cb8258d15 recipes: convert tabs to 4 spaces in populate_packages
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-07-19 16:26:18 +02:00
Koen Kooi aa4f437796 various: update ; proto= to ; protocol= in SRC_URI
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-07-16 11:06:40 +02:00
Koen Kooi 82fe3fa0a8 opencv, opencv-samples: drop 2.3.1
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-07-13 10:19:57 +02:00
Koen Kooi 888509e75f opencv, opencv-samples: add 2.4.2
Libav is easier to get right than gstreamer, so switch back. Also enable libv4l for better v4l(2) support

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-07-13 10:19:57 +02:00
Andreas Oberritter 629d9fa067 bzip2: bump PR of all recipes depending on bzip2
* Commit e27af1f273e9a7348dd8f5542df9206acd9210f3 of OE-core
  split bzip2 into binary and library packages.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-03-09 07:50:38 +01:00
Otavio Salvador 59de020063 More quotting fixes
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-02-29 14:52:45 +01:00
Martin Jansa 8cd93743d7 Quoting fixes
* We have various variables which are either not quoted at all or are
* half quoted. This patch fixes the bad exmaples so everything is consistent.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-02-26 23:57:23 +01:00
Koen Kooi 9436293699 opencv: bump SRCREV
opencv doesn't work with libav, so make gstreamer the default

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-01-24 18:54:45 +01:00
Connor Abbott 4d73a968b2 opencv: import from oe-classic and upgrade to 2.3.1
OpenCV <= 2.2 won't compile on oe-core due to the lack of v4l1 headers, and therefore wasn't included in this patch.
Also, the support for newer cv2-style python bindings is a bit hacked up at the moment due to the way OpenCV detects the Python version and Numpy headers (see 0001-Fix-CMakeLists.txt-numpy-detection.patch). In particular, it requires the native & target python to be the same version and have similar site-packages directories, which is true at least for now in OE.

Signed-off-by: Connor Abbott <cwabbott0@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2011-11-01 08:35:36 +01:00