Skip to content

Commit

Permalink
use packaged "opencv" from OS
Browse files Browse the repository at this point in the history
previously, opencv-2.4.9 was downloaded and compiled from source. now use the precompiled, package version from the OS. this comes in:

Debian Testing (Jessie): 2.4.9
Debian Stable (Wheezy): 2.3.1  # quite old. but is Wheezy still supported? boostrap.sh fails unmodified
Ubuntu 14.04 (Trusty): 2.4.8
Ubuntu 12.04 (Precise): 2.3.1  # not supported anymore?

there are more OS in the osdeps-file, where I just assume they bring similar packaged versions.

tested "image_processing/{frame_helper,stereo} in Jessie and Trusty. but obviously that shouldn't be it. which packages else?

Signed-off-by: Martin Zenzes <[email protected]>
  • Loading branch information
marvin2k committed Dec 18, 2014
1 parent d959ff3 commit 546fe5c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 31 deletions.
18 changes: 0 additions & 18 deletions 06osdeps_from_source.autobuild

This file was deleted.

13 changes: 4 additions & 9 deletions rock.osdeps
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,7 @@ qt-designer:
macos-brew: qt4

opencv:
debian:
'wheezy,sid':
- libopencv-dev
ubuntu:
'10.04,10.10,11.04,11.10': nonexistent
default:
- libopencv-dev
- libcv-dev
- libhighgui-dev
debian, ubuntu: libopencv-dev
gentoo: media-libs/opencv
fedora: opencv-devel
arch,manjarolinux: opencv
Expand All @@ -144,3 +136,6 @@ jpeg:

bundler: gem
cucumber: gem

clang-3.5:
debian: clang-3.5 libclang-3.5-dev
4 changes: 0 additions & 4 deletions source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ version_control:
type: archive
url: https://github.com/SINTEF-Geometry/SISL/archive/SISL-4.6.0.tar.gz
update_cached_file: false
- external/opencv:
type: archive
url: http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.9/opencv-2.4.9.zip
update_cached_file: false

overrides:
- ^(orogen|typelib|rtt|utilrb|utilmm|rtt_typelib|tools/metaruby)$:
Expand Down

0 comments on commit 546fe5c

Please sign in to comment.