[opencv] 11/11: Merge tag 'debian/3.2.0+dfsg-2'
Mattia Rizzolo
mattia at debian.org
Mon Oct 16 22:03:57 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 bd03828fc5566ba3bf2a437fda32ead34179951f
Merge: 621f4fc 75d9d37
Author: Mattia Rizzolo <mattia at debian.org>
Date: Tue Oct 17 00:02:41 2017 +0200
Merge tag 'debian/3.2.0+dfsg-2'
opencv Debian release 3.2.0+dfsg-2
debian/changelog | 17 ++++++++++
debian/control | 6 ++--
debian/patches/fix_ftbfs_on_non_linux | 24 ++-------------
debian/patches/series | 1 -
debian/patches/support_x32 | 58 -----------------------------------
debian/rules | 31 +++++++------------
6 files changed, 35 insertions(+), 102 deletions(-)
diff --cc debian/changelog
index a2a7c13,8efdda9..4f016fc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,20 +1,27 @@@
+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-2) unstable; urgency=medium
+
+ * Team upload.
+ * d/patches:
+ + support_x32 patch: drop, it actually did nothing useful.
+ + fix_ftbfs_on_non_linux: simplify patch, by removing several hunks no
+ longer needed.
+ Incidentally, this fixes the FTBFS in x32. Closes: #878705
+ * d/rules:
+ + Enable DICOM support. Closes: #843513
+ + tbb is now available in all linux archs, so enable it for all linux-any.
+ + Enable SSE and SSE2 on all architectures based on a amd64 cpu, not just
+ amd64 itself
+ + Use /usr/share/dpkg/architecture.mk instead of calling dpkg-architecture.
+
+ -- Mattia Rizzolo <mattia at debian.org> Mon, 16 Oct 2017 23:44:22 +0200
+
opencv (3.2.0+dfsg-1) unstable; urgency=medium
* Team upload.
diff --cc debian/control
index 1e2de9c,e64998e..60d9700
--- a/debian/control
+++ b/debian/control
@@@ -154,11 -155,11 +155,11 @@@ Section: libdeve
Architecture: any
Multi-Arch: same
Depends:
- libopencv-core3.2 (= ${binary:Version}),
+ libopencv-core3.3 (= ${binary:Version}),
- libtbb-dev [i386 amd64 ia64 powerpc ppc64 ppc64el],
+ libtbb-dev [linux-any],
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.
.
@@@ -291,10 -292,11 +292,11 @@@ Section: libdeve
Architecture: any
Multi-Arch: same
Depends:
+ libgdcm2-dev [!hppa !m68k !powerpcspe !sh4],
- libopencv-imgcodecs3.2 (= ${binary:Version}),
+ libopencv-imgcodecs3.3 (= ${binary:Version}),
libopencv-imgproc-dev (= ${binary:Version}),
${misc:Depends},
-Description: development files for libopencv-imgcodecs3.2
+Description: development files for libopencv-imgcodecs3.3
This package contains the header files and static library needed to compile
applications that use OpenCV (Open Computer Vision) Image Codecs library.
.
diff --cc debian/patches/fix_ftbfs_on_non_linux
index d3b2a14,95a18e5..43b5bd0
--- a/debian/patches/fix_ftbfs_on_non_linux
+++ b/debian/patches/fix_ftbfs_on_non_linux
@@@ -1,13 -1,11 +1,11 @@@
Description: Fix FTBFS on non linux
Forwarded: not yet
Author: Pino Toscano <pino at debian.org>
-Last-Update: 2017-05-09
+Last-Update: 2017-08-27
- diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp
- index 53ebb4212e..0edef5b30e 100644
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
- @@ -52,13 +52,13 @@
-@@ -50,7 +50,7 @@
++@@ -52,7 +52,7 @@
#undef abs
#endif
@@@ -16,15 -14,8 +14,8 @@@
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
- #if defined __ANDROID__
- #include <sys/sysconf.h>
- - #elif defined __APPLE__
- + #elif defined __APPLE__ || !defined __GNU__
- #include <sys/sysctl.h>
- #endif
- #endif
- @@ -644,7 +644,7 @@ int cv::getNumberOfCPUs(void)
-@@ -562,7 +562,7 @@
- #elif defined ANDROID
++@@ -644,7 +644,7 @@
+ #elif defined __ANDROID__
static int ncpus = getNumberOfCPUsImpl();
return ncpus;
-#elif defined __linux__
@@@ -32,13 -23,11 +23,11 @@@
return (int)sysconf( _SC_NPROCESSORS_ONLN );
#elif defined __APPLE__
int numCPU=0;
- diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
- index 3eeb5fe9ba..3d628cda3b 100644
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
- @@ -202,12 +202,14 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
-@@ -198,7 +198,7 @@
-
- #include <stdarg.h>
++@@ -202,7 +202,7 @@
+ #include "omp.h"
+ #endif
-#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__
+#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ || defined __GLIBC__
diff --cc debian/rules
index 1ab4c7c,33d13a1..7c9b478
--- a/debian/rules
+++ b/debian/rules
@@@ -8,24 -6,17 +6,17 @@@ include /usr/share/dpkg/architecture.m
BUILDDIR = obj-$(DEB_HOST_MULTIARCH)
# SSE options
- ifeq ($(DEB_HOST_ARCH),amd64)
+ 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), i386 amd64 ia64 powerpc ppc64 ppc64el))
- 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
+ CMAKE_ARCH_FLAGS += -DWITH_1394=ON -DWITH_V4L=ON -DWITH_TBB=ON
else
- CMAKE_ARCH_FLAGS += -DWITH_1394=OFF -DWITH_V4L=OFF
+ CMAKE_ARCH_FLAGS += -DWITH_1394=OFF -DWITH_V4L=OFF -DWITH_TBB=OFF
endif
# For Java
@@@ -55,9 -46,9 +46,10 @@@ CMAKE_FLAGS =
-DWITH_EIGEN=ON \
-DWITH_VTK=ON \
-DWITH_GDAL=ON \
+ -DWITH_GDCM=ON \
-DWITH_XINE=OFF \
-DWITH_IPP=OFF \
+ -DWITH_ITT=OFF \
-DBUILD_TESTS=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DWITH_CUDA=OFF \
--
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