[opencv] 11/13: Disable DNN module (temporary)

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to branch master
in repository opencv.

commit ad6e1feee5606b2c58138e81bcc1261a9c1f2fea
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Wed May 10 05:01:25 2017 +0900

    Disable DNN module (temporary)
    
    DNN module needs protobuf 3.1. But this version is not installed
    in Debian. This temporarily disables DNN module.
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
---
 debian/libopencv-contrib-dev.install | 10 +++++-----
 debian/libopencv-contrib3.2.install  |  4 ++--
 debian/patches/disable_dnn.patch     | 12 ++++++++++++
 debian/patches/series                |  1 +
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/debian/libopencv-contrib-dev.install b/debian/libopencv-contrib-dev.install
index fd853f8..a7071ee 100644
--- a/debian/libopencv-contrib-dev.install
+++ b/debian/libopencv-contrib-dev.install
@@ -18,11 +18,11 @@ usr/include/opencv2/ccalib/*
 usr/include/opencv2/ccalib.hpp
 usr/lib/*/libopencv_ccalib.a
 usr/lib/*/libopencv_ccalib.so
-# dnn
-usr/include/opencv2/dnn/*
-usr/include/opencv2/dnn.hpp
-usr/lib/*/libopencv_dnn.a
-usr/lib/*/libopencv_dnn.so
+# dnn / disable / need protobuf 3.1
+#usr/include/opencv2/dnn/*
+#usr/include/opencv2/dnn.hpp
+#usr/lib/*/libopencv_dnn.a
+#usr/lib/*/libopencv_dnn.so
 # dpm
 usr/include/opencv2/dpm.hpp
 usr/lib/*/libopencv_dpm.a
diff --git a/debian/libopencv-contrib3.2.install b/debian/libopencv-contrib3.2.install
index c971c25..61bbdda 100644
--- a/debian/libopencv-contrib3.2.install
+++ b/debian/libopencv-contrib3.2.install
@@ -3,7 +3,7 @@ usr/lib/*/libopencv_bgsegm.so.*
 usr/lib/*/libopencv_bioinspired.so.*
 usr/lib/*/libopencv_ccalib.so.*
 usr/lib/*/libopencv_datasets.so.*
-usr/lib/*/libopencv_dnn.so.*
+# usr/lib/*/libopencv_dnn.so.*
 usr/lib/*/libopencv_dpm.so.*
 usr/lib/*/libopencv_face.so.*
 usr/lib/*/libopencv_fuzzy.so.*
@@ -18,7 +18,7 @@ usr/lib/*/libopencv_stereo.so.*
 usr/lib/*/libopencv_structured_light.so.*
 usr/lib/*/libopencv_surface_matching.so.*
 usr/lib/*/libopencv_text.so.*
-usr/lib/*/libopencv_tracking.so.*
+# usr/lib/*/libopencv_tracking.so.*
 usr/lib/*/libopencv_ximgproc.so.*
 usr/lib/*/libopencv_xobjdetect.so.*
 usr/lib/*/libopencv_xphoto.so.*
diff --git a/debian/patches/disable_dnn.patch b/debian/patches/disable_dnn.patch
new file mode 100644
index 0000000..a2b9180
--- /dev/null
+++ b/debian/patches/disable_dnn.patch
@@ -0,0 +1,12 @@
+diff --git a/contrib/modules/dnn/CMakeLists.txt b/contrib/modules/dnn/CMakeLists.txt
+index 7e7a471993..262f87f629 100644
+--- a/contrib/modules/dnn/CMakeLists.txt
++++ b/contrib/modules/dnn/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ cmake_minimum_required(VERSION 2.8)
+ 
++ocv_module_disable(dnn)
++
+ if(APPLE_FRAMEWORK OR WINRT
+     OR AARCH64 # protobuf doesn't know this platform
+ )
diff --git a/debian/patches/series b/debian/patches/series
index 8a4f9df..dd22f72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ support_x32
 disable_opengl_test_build
 mathjax
 change_jquery.js_path
+disable_dnn.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git