From f01ee7a2104a253a91816c59becfd5c69e2273c3 Mon Sep 17 00:00:00 2001 From: Alexander Duda Date: Thu, 30 Oct 2014 14:46:13 +0100 Subject: [PATCH] use opencv's git instead of archive --- 06osdeps_from_source.autobuild | 6 ------ source.yml | 6 ++---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/06osdeps_from_source.autobuild b/06osdeps_from_source.autobuild index 87a5a91a..51716047 100644 --- a/06osdeps_from_source.autobuild +++ b/06osdeps_from_source.autobuild @@ -16,9 +16,3 @@ in_flavor 'master', 'next', 'stable' do remove_from_default 'external/opencv' end -only_in_flavor 'master', 'next' do - setup_package 'external/opencv' do |pkg| - pkg.importer.relocate "http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.5/opencv-2.4.5.tar.gz" - end -end - diff --git a/source.yml b/source.yml index 9bd39736..f1809b64 100644 --- a/source.yml +++ b/source.yml @@ -77,11 +77,9 @@ version_control: type: archive url: http://www.sintef.no/upload/IKT/9011/geometri/sisl/sisl-4.5.0.tar.gz update_cached_file: false - - external/opencv: - type: archive - url: http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.3/OpenCV-2.3.0.tar.bz2 - update_cached_file: false + github: Itseez/opencv.git + branch: 2.4 - bundles/.*: github: rock-core/bundles-$PACKAGE_BASENAME.git