From 2d2e7f089f9facbae67ffa7d66ef3d2c7c98feff Mon Sep 17 00:00:00 2001
From: Martin Zenzes <martin.zenzes@dfki.de>
Date: Thu, 18 Dec 2014 17:13:50 +0100
Subject: [PATCH 1/2] 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>
---
 rock.osdeps | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/rock.osdeps b/rock.osdeps
index 54698bb0..b603e1c7 100644
--- a/rock.osdeps
+++ b/rock.osdeps
@@ -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

From cfb3d7e92b7845e206cc0cac60e326cbc2bbc84e Mon Sep 17 00:00:00 2001
From: Martin Zenzes <martin.zenzes@dfki.de>
Date: Thu, 18 Dec 2014 17:14:15 +0100
Subject: [PATCH 2/2] remove opencv source-compilation information

---
 06osdeps_from_source.autobuild | 18 ------------------
 source.yml                     |  4 ----
 2 files changed, 22 deletions(-)
 delete mode 100644 06osdeps_from_source.autobuild

diff --git a/06osdeps_from_source.autobuild b/06osdeps_from_source.autobuild
deleted file mode 100644
index da7b88df..00000000
--- a/06osdeps_from_source.autobuild
+++ /dev/null
@@ -1,18 +0,0 @@
-in_flavor 'master', 'stable' do
-    cmake_package 'external/opencv' do |pkg|
-        pkg.define("CMAKE_BUILD_TYPE","Release")
-        if not RUBY_PLATFORM.downcase.include?("arm")
-           pkg.define("ENABLE_SSE3","ON")
-           pkg.define("ENABLE_SSE41","OFF")
-           pkg.define("ENABLE_SSE42","OFF")
-           pkg.define("ENABLE_SSSE3","OFF")
-        end
-        pkg.define("BUILD_EXAMPLES","OFF")
-        pkg.define("BUILD_NEW_PYTHON_SUPPORT","OFF")
-        pkg.define("WITH_FFMPEG","OFF")
-        pkg.define("BUILD_TESTS","OFF")
-    end
-    Autoproj.add_osdeps_overrides 'opencv', :package => 'external/opencv'
-    remove_from_default 'external/opencv'
-end
-
diff --git a/source.yml b/source.yml
index 27223891..8773a9f3 100644
--- a/source.yml
+++ b/source.yml
@@ -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)$: