[opencv] 07/08: Don't build with jasper. Closes: #818207 This causes libopencv-highgui to lose symbols, so we need to rename the package and do a transition. (from mapreri)
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Fri Jul 8 16:10:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch experimental/master
in repository opencv.
commit ec54ad5b3f891ad9810c3ab6496f28264d4b4b45
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Jul 8 18:04:07 2016 +0200
Don't build with jasper. Closes: #818207
This causes libopencv-highgui to lose symbols, so we need to rename the
package and do a transition.
(from mapreri)
---
debian/control | 18 +++++++++---------
...ui3.0.install => libopencv-highgui3.0-deb0.install} | 0
debian/rules | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/debian/control b/debian/control
index 2b93e09..c8390d7 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 9),
cmake (>= 2.8.7),
libavcodec-dev, libavformat-dev, libswscale-dev, libgtk2.0-dev, libgtkglext1-dev,
libgl1-mesa-dev, libglu1-mesa-dev,
- libjasper-dev (>= 1.900.1),
libjpeg-dev,
libpng-dev,
libtiff-dev,
@@ -505,7 +504,7 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
- libopencv-highgui3.0 (= ${binary:Version}),
+ libopencv-highgui3.0-deb0 (= ${binary:Version}),
libopencv-ml3.0 (= ${binary:Version})
Description: computer vision Object Detection library
This package contains the OpenCV (Open Computer Vision) Object Detection
@@ -548,12 +547,11 @@ Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
libopencv-videoio-dev (= ${binary:Version}),
- libopencv-highgui3.0 (= ${binary:Version}),
+ libopencv-highgui3.0-deb0 (= ${binary:Version}),
libavcodec-dev (>= 0.svn20080206),
libavformat-dev,
libswscale-dev,
libgtk2.0-dev,
- libjasper-dev (>= 1.900.1),
libjpeg-dev,
libpng-dev,
libtiff-dev,
@@ -575,7 +573,7 @@ Description: development files for libopencv-highgui3.0
analysis, structural analysis, motion analysis and object tracking, object
recognition, camera calibration and 3D reconstruction.
-Package: libopencv-highgui3.0
+Package: libopencv-highgui3.0-deb0
Section: libs
Architecture: any
Multi-Arch: same
@@ -583,6 +581,8 @@ Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends},
libopencv-videoio3.0 (= ${binary:Version})
+Conflicts: libopencv-highgui3.0-deb0
+Replaces: libopencv-highgui3.0-deb0
Description: computer vision High-level GUI and Media I/O library
This package contains the OpenCV (Open Computer Vision) High-level GUI
and Media I/O runtime libraries.
@@ -602,7 +602,7 @@ Section: debug
Architecture: any
Priority: extra
Depends: ${misc:Depends},
- libopencv-highgui3.0 (= ${binary:Version})
+ libopencv-highgui3.0-deb0 (= ${binary:Version})
Description: debugging symbols for libopencv-highgui3.0
This package contains detached debugging symbols for OpenCV (Open Computer
Vision) High-level GUI and Media I/O runtime libraries.
@@ -774,7 +774,7 @@ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-flann3.0 (= ${binary:Version}),
libopencv-ml3.0 (= ${binary:Version}),
- libopencv-highgui3.0 (= ${binary:Version}),
+ libopencv-highgui3.0-deb0 (= ${binary:Version}),
Description: computer vision Feature Detection and Descriptor Extraction library
This package contains the OpenCV (Open Computer Vision) Feature Detection
and Descriptor Extraction runtime libraries.
@@ -1259,7 +1259,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-calib3d3.0 (= ${binary:Version}),
libopencv-ml3.0 (= ${binary:Version}),
libopencv-objdetect3.0 (= ${binary:Version}),
- libopencv-highgui3.0 (= ${binary:Version}),
+ libopencv-highgui3.0-deb0 (= ${binary:Version}),
libopencv-video3.0 (= ${binary:Version}),
libopencv-photo3.0 (= ${binary:Version})
Description: Java jni library for the computer vision library
@@ -1293,7 +1293,7 @@ Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-numpy-abi
libopencv-features2d3.0 (= ${binary:Version}),
libopencv-flann3.0 (= ${binary:Version}),
libopencv-ml3.0 (= ${binary:Version}),
- libopencv-highgui3.0 (= ${binary:Version}),
+ libopencv-highgui3.0-deb0 (= ${binary:Version}),
libopencv-videoio3.0 (= ${binary:Version}),
libopencv-imgcodecs3.0 (= ${binary:Version}),
libopencv-imgproc3.0 (= ${binary:Version})
diff --git a/debian/libopencv-highgui3.0.install b/debian/libopencv-highgui3.0-deb0.install
similarity index 100%
rename from debian/libopencv-highgui3.0.install
rename to debian/libopencv-highgui3.0-deb0.install
diff --git a/debian/rules b/debian/rules
index 715ab99..cdcd6cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,7 @@ CMAKE_FLAGS = \
-DWITH_FFMPEG=ON \
-DWITH_GSTREAMER=OFF \
-DWITH_GTK=ON \
- -DWITH_JASPER=ON \
+ -DWITH_JASPER=OFF \
-DWITH_JPEG=ON \
-DWITH_PNG=ON \
-DWITH_TIFF=ON \
--
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