[opencv] 14/17: Disable dnn_modern

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 2fe0977767b0ba2fb7f063ae831db3e968a7f7da
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Tue Aug 29 01:42:54 2017 +0900

    Disable dnn_modern
    
    Add patches/disable_dnn_modern
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
---
 debian/patches/disable_dnn_modern | 9 +++++++++
 debian/patches/series             | 1 +
 debian/rules                      | 1 +
 3 files changed, 11 insertions(+)

diff --git a/debian/patches/disable_dnn_modern b/debian/patches/disable_dnn_modern
new file mode 100644
index 0000000..46f2e09
--- /dev/null
+++ b/debian/patches/disable_dnn_modern
@@ -0,0 +1,9 @@
+diff --git a/contrib/modules/dnn_modern/CMakeLists.txt b/contrib/modules/dnn_modern/CMakeLists.txt
+index 79b64b1216..77bb47f8ac 100644
+--- a/contrib/modules/dnn_modern/CMakeLists.txt
++++ b/contrib/modules/dnn_modern/CMakeLists.txt
+@@ -1,3 +1,4 @@
++ocv_module_disable(dnn_modern)
+ set(the_description "Modern Deep Learning module")
+ 
+ if(${CMAKE_VERSION} VERSION_LESS 3.2)
diff --git a/debian/patches/series b/debian/patches/series
index 8a4f9df..91d8c67 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_modern
diff --git a/debian/rules b/debian/rules
index ca842ec..10c8569 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,7 @@ CMAKE_FLAGS = \
 	-DWITH_IPP=OFF \
 	-DWITH_CAROTENE=OFF \
 	-DBUILD_opencv_dnn=OFF \
+	-DBUILD_opencv_dnn_modern=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