[opencv] 13/17: Disable build DNN module

Nobuhiro Iwamatsu iwamatsu at moszumanska.debian.org
Tue Sep 5 23:03:46 UTC 2017


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

iwamatsu pushed a commit to branch master
in repository opencv.

commit bacc2a1606efbef300e90adadabf66128e20a218
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Tue Aug 29 12:34:00 2017 +0900

    Disable build DNN module
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
---
 debian/patches/disable_dnn.patch | 12 ------------
 debian/patches/series            |  1 -
 debian/rules                     |  1 +
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/debian/patches/disable_dnn.patch b/debian/patches/disable_dnn.patch
deleted file mode 100644
index a2b9180..0000000
--- a/debian/patches/disable_dnn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 dd22f72..8a4f9df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ support_x32
 disable_opengl_test_build
 mathjax
 change_jquery.js_path
-disable_dnn.patch
diff --git a/debian/rules b/debian/rules
index bc1bd6a..ca842ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,7 @@ CMAKE_FLAGS = \
 	-DENABLE_PRECOMPILED_HEADERS=OFF \
 	-DWITH_IPP=OFF \
 	-DWITH_CAROTENE=OFF \
+	-DBUILD_opencv_dnn=OFF \
 	-DOPENCL_INCLUDE_DIR:PATH="/usr/include/CL/" \
 	-DOPENCV_EXTRA_MODULES_PATH="$(CURDIR)/contrib/modules" \
 	$(CMAKE_ARCH_FLAGS)

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



More information about the debian-science-commits mailing list