[opencv] 01/01: Merge tag 'debian/3.2.0+dfsg-3'
Mattia Rizzolo
mattia at debian.org
Tue Oct 17 16:59:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository opencv.
commit b88865b7c99c82999d56a963916d1a6432ab6a29
Merge: bd03828 8c308f9
Author: Mattia Rizzolo <mattia at debian.org>
Date: Tue Oct 17 18:59:16 2017 +0200
Merge tag 'debian/3.2.0+dfsg-3'
opencv Debian release 3.2.0+dfsg-3
debian/changelog | 14 ++++++++++++++
debian/control | 7 +++++--
debian/patches/mathjax | 34 +++++++++++++++-------------------
debian/patches/support_multiarch | 18 +++++-------------
debian/rules | 12 ++++++++++--
5 files changed, 49 insertions(+), 36 deletions(-)
diff --cc debian/changelog
index 4f016fc,533aefc..7c538b6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,24 @@@
+opencv (3.3.0+dfsg-1~exp1) UNRELEASED; urgency=medium
+
+ * Update to 3.3.0.
+ * Add Add img_hasn and traking modules to libopencv-contrib.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Mon, 28 Aug 2017 08:09:26 +0900
+
+ opencv (3.2.0+dfsg-3) unstable; urgency=medium
+
+ * Team upload.
+ * d/p/support_multiarch: forward the patch after a small edit.
+ * d/p/mathjax: make the MATHJAX_RELPATH option configurable at build time
+ through cmake, and then forward the patch.
+ * Despite tbb being available in all linux architectures, we need it in a
+ version that is not available everywhere, so revert back to enabling it
+ only on a hand-picked list of architectures. Closes: #878830
+ * d/control: work around #878878 in dbus by explictly adding dbus-x11 to
+ build-deps for !linux.
+
+ -- Mattia Rizzolo <mattia at debian.org> Tue, 17 Oct 2017 16:27:02 +0200
+
opencv (3.2.0+dfsg-2) unstable; urgency=medium
* Team upload.
diff --cc debian/control
index 60d9700,6792c4c..7d2bd92
--- a/debian/control
+++ b/debian/control
@@@ -155,11 -158,11 +158,11 @@@ Section: libdeve
Architecture: any
Multi-Arch: same
Depends:
- libopencv-core3.2 (= ${binary:Version}),
+ libopencv-core3.3 (= ${binary:Version}),
- libtbb-dev [linux-any],
+ libtbb-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x powerpc powerpcspe ppc64 sh4 sparc64],
zlib1g-dev,
${misc:Depends},
-Description: development files for libopencv-core3.2
+Description: development files for libopencv-core3.3
This package contains the header files and static library needed to compile
applications that use OpenCV (Open Computer Vision) core.
.
diff --cc debian/patches/mathjax
index 7f825c1,e96b265..2d2195a
--- a/debian/patches/mathjax
+++ b/debian/patches/mathjax
@@@ -1,27 -1,25 +1,23 @@@
- From 14e24055b7cc93b0de4b614db5b7bad201d1e055 Mon Sep 17 00:00:00 2001
- From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
- Date: Tue, 29 Aug 2017 12:30:21 +0900
- Subject: [PATCH 3/4] use system-installed mathjx instead of downloading from
- the net
+ Description: use system-installed mathjx instead of downloading from the net
+ Forwarded: https://github.com/opencv/opencv/pull/9866
- Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
- ---
- doc/Doxyfile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
- diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
- index dd8d325c4d..f7c8ddff63 100644
----- a/doc/Doxyfile.in
--+++ b/doc/Doxyfile.in
- @@ -174,7 +174,7 @@ FORMULA_FONTSIZE = 14
+ @@ -174,7 +174,7 @@
FORMULA_TRANSPARENT = YES
USE_MATHJAX = YES
MATHJAX_FORMAT = HTML-CSS
--MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+-MATHJAX_RELPATH = http://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0
- +MATHJAX_RELPATH = /usr/share/javascript/mathjax/
+ +MATHJAX_RELPATH = @OPENCV_MATHJAX_RELPATH@
MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
MATHJAX_CODEFILE = @CMAKE_CURRENT_SOURCE_DIR@/mymath.js
SEARCHENGINE = YES
- --
- 2.14.1
-
+ --- a/doc/CMakeLists.txt
+ +++ b/doc/CMakeLists.txt
+ @@ -36,6 +36,8 @@
+ list(APPEND blacklist "ts" "java" "python2" "python3" "world" "contrib_world")
+ unset(CMAKE_DOXYGEN_TUTORIAL_CONTRIB_ROOT)
+
-+ set(OPENCV_MATHJAX_RELPATH "http://cdn.mathjax.org/mathjax/latest" CACHE STRING "URI to a MathJax installation")
+++ set(OPENCV_MATHJAX_RELPATH "http://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0" CACHE STRING "URI to a MathJax installation")
+ +
+ # gathering headers
+ set(paths_include)
+ set(paths_doc)
diff --cc debian/patches/support_multiarch
index 51b79e3,7a33926..898c988
--- a/debian/patches/support_multiarch
+++ b/debian/patches/support_multiarch
@@@ -1,10 -1,9 +1,9 @@@
Description: Install the libraries in the multiarch path
+ Forwarded: https://github.com/opencv/opencv/pull/9864
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index af5e2c1ede..53ff88ec63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
- @@ -426,7 +426,7 @@ else()
-@@ -395,7 +395,8 @@
++@@ -426,7 +426,8 @@
ocv_update(OPENCV_OTHER_INSTALL_PATH etc)
ocv_update(OPENCV_CONFIG_INSTALL_PATH ".")
else()
@@@ -13,7 -13,7 +13,7 @@@
ocv_update(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples)
ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
- @@ -435,7 +435,7 @@ else()
-@@ -404,7 +405,7 @@
++@@ -435,7 +436,7 @@
if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
diff --cc debian/rules
index 7c9b478,0b384f7..3185dc8
--- a/debian/rules
+++ b/debian/rules
@@@ -7,16 -7,23 +7,23 @@@ BUILDDIR = obj-$(DEB_HOST_MULTIARCH
# SSE options
ifeq ($(DEB_HOST_ARCH_CPU),amd64)
-CMAKE_ARCH_FLAGS = -DENABLE_SSE=ON -DENABLE_SSE2=ON -DENABLE_SSE3=OFF
+CMAKE_ARCH_FLAGS = -DENABLE_MSSE=ON -DENABLE_MSSE2=ON -DENABLE_MSSE3=OFF
else
-CMAKE_ARCH_FLAGS = -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_SSE3=OFF
+CMAKE_ARCH_FLAGS = -DENABLE_MSSE=OFF -DENABLE_MSSE2=OFF -DENABLE_MSSE3=OFF
endif
+ # TBB support
+ ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x powerpc powerpcspe ppc64 sh4 sparc64))
+ CMAKE_ARCH_FLAGS += -DWITH_TBB=ON
+ else
+ CMAKE_ARCH_FLAGS += -DWITH_TBB=OFF
+ endif
+
# Linux-specific stuff
ifeq ($(DEB_HOST_ARCH_OS),linux)
- CMAKE_ARCH_FLAGS += -DWITH_1394=ON -DWITH_V4L=ON -DWITH_TBB=ON
+ CMAKE_ARCH_FLAGS += -DWITH_1394=ON -DWITH_V4L=ON
else
- CMAKE_ARCH_FLAGS += -DWITH_1394=OFF -DWITH_V4L=OFF -DWITH_TBB=OFF
+ CMAKE_ARCH_FLAGS += -DWITH_1394=OFF -DWITH_V4L=OFF
endif
# For Java
--
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