Add opencv-contrib.tar.gz

From 3.x some of modules in OpenCV are moved to opencv-contrib as
external repository. To support them, archive the repository as tar.gz
and then added to OpenCV.

Related changes are also applied to opencv.spec file.

Change-Id: I521d7ba3e40db59a07cc186ff80ebd40367cd012
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
(cherry picked from commit 2f90508a69dfa562645af1972d6c77461cb91563)

diff --git a/packaging/opencv-contrib.tar.gz b/packaging/opencv-contrib.tar.gz
new file mode 100644 (file)
index 0000000..a532e0d
Binary files /dev/null and b/packaging/opencv-contrib.tar.gz differ

diff --git a/packaging/opencv.spec b/packaging/opencv.spec
index 0c90f77..6056146 100644 (file)
--- a/packaging/opencv.spec
+++ b/packaging/opencv.spec
@@ -5,7 +5,7 @@ Release: 1
 Group: Development/Libraries
 License: BSD-3-Clause and LGPL-2.1+
 Source0: %{name}-%{version}.tar.gz
-#Source100: opencv-contrib.tar.gz
+Source100: opencv-contrib.tar.gz
 
 %if "%{_with_emulator}" != "1"
 BuildRequires:  mesa-devel
@@ -41,6 +41,7 @@ The Open Computer Vision Library (Dev) includes various algorithms for computer
 
 %prep
 %setup -q
+%setup -q -T -D -a 100
 
 %build
 %ifarch aarch64 x86_64
@@ -80,6 +81,41 @@ cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
        -DBUILD_opencv_world=OFF \
        -DBUILD_opencv_python=OFF \
        -DBUILD_opencv_viz=OFF \
+       -DOPENCV_EXTRA_MODULES_PATH=../opencv-contrib/modules \
+       -DBUILD_opencv_aruco=OFF \
+       -DBUILD_opencv_bgsegm=OFF \
+       -DBUILD_opencv_bioinspired=OFF \
+       -DBUILD_opencv_ccalib=OFF \
+       -DBUILD_opencv_cnn_3dobj=OFF \
+       -DBUILD_opencv_datasets=OFF \
+       -DBUILD_opencv_dnn_modern=OFF \
+       -DBUILD_opencv_dnns_easily_fooled=OFF \
+       -DBUILD_opencv_dpm=OFF \
+       -DBUILD_opencv_face=ON \
+       -DBUILD_opencv_freetype=OFF \
+       -DBUILD_opencv_fuzzy=OFF \
+       -DBUILD_opencv_hdf=OFF \
+       -DBUILD_opencv_img_hash=OFF \
+       -DBUILD_opencv_line_descriptor=OFF \
+       -DBUILD_opencv_matlab=OFF \
+       -DBUILD_opencv_optflow=OFF \
+       -DBUILD_opencv_ovis=OFF \
+       -DBUILD_opencv_phase_unwrapping=OFF \
+       -DBUILD_opencv_plot=ON \
+       -DBUILD_opencv_reg=OFF \
+       -DBUILD_opencv_rgbd=OFF \
+       -DBUILD_opencv_saliency=OFF \
+       -DBUILD_opencv_sfm=OFF \
+       -DBUILD_opencv_stereo=OFF \
+       -DBUILD_opencv_stitching=OFF \
+       -DBUILD_opencv_structured_light=OFF \
+       -DBUILD_opencv_surface_matching=OFF \
+       -DBUILD_opencv_text=OFF \
+       -DBUILD_opencv_tracking=ON \
+       -DBUILD_opencv_xfeatures2d=ON \
+       -DBUILD_opencv_ximgproc=OFF \
+       -DBUILD_opencv_xobjdetect=OFF \
+       -DBUILD_opencv_xphoto=OFF \
        -DBUILD_ZLIB=OFF \
        -DBUILD_TIFF=OFF \
        -DBUILD_JASPER=OFF \