Skip to content

Commit 546fe5c

Browse files
committedDec 18, 2014
use packaged "opencv" from OS
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 <martin.zenzes@dfki.de>
1 parent d959ff3 commit 546fe5c

File tree

3 files changed

+4
-31
lines changed

3 files changed

+4
-31
lines changed
 

‎06osdeps_from_source.autobuild

-18
This file was deleted.

‎rock.osdeps

+4-9
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,7 @@ qt-designer:
121121
macos-brew: qt4
122122

123123
opencv:
124-
debian:
125-
'wheezy,sid':
126-
- libopencv-dev
127-
ubuntu:
128-
'10.04,10.10,11.04,11.10': nonexistent
129-
default:
130-
- libopencv-dev
131-
- libcv-dev
132-
- libhighgui-dev
124+
debian, ubuntu: libopencv-dev
133125
gentoo: media-libs/opencv
134126
fedora: opencv-devel
135127
arch,manjarolinux: opencv
@@ -144,3 +136,6 @@ jpeg:
144136

145137
bundler: gem
146138
cucumber: gem
139+
140+
clang-3.5:
141+
debian: clang-3.5 libclang-3.5-dev

‎source.yml

-4
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ version_control:
8383
type: archive
8484
url: https://github.com/SINTEF-Geometry/SISL/archive/SISL-4.6.0.tar.gz
8585
update_cached_file: false
86-
- external/opencv:
87-
type: archive
88-
url: http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.9/opencv-2.4.9.zip
89-
update_cached_file: false
9086

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

0 commit comments

Comments
 (0)