diffstat of debian/ for opencv_2.4.2+dfsg-0exp2 opencv_2.4.2+dfsg-0exp2ubuntu1endless2 changelog | 31 +++++++++++++++++++++++++++++++ control | 8 +++----- patches/fix-flann-gcc-c++11-bug.patch | 13 +++++++++++++ patches/series | 1 + rules | 2 +- 5 files changed, 49 insertions(+), 6 deletions(-) diff -Nru opencv-2.4.2+dfsg/debian/changelog opencv-2.4.2+dfsg/debian/changelog --- opencv-2.4.2+dfsg/debian/changelog 2012-10-07 02:20:04.000000000 +0000 +++ opencv-2.4.2+dfsg/debian/changelog 2015-05-18 20:29:54.000000000 +0000 @@ -1,3 +1,34 @@ +opencv (2.4.2+dfsg-0exp2ubuntu1endless2) eos; urgency=medium + + * debian/control: + - Remove dependencie on gstreamer, wrongly added before. + * debian/rules: + - Disable GSTREAMER support, as it's based on 0.10 and we don't have that. + + [endlessm/shell#5067] + + -- Mario Sanchez Prada Mon, 18 May 2015 21:29:01 +0100 + +opencv (2.4.2+dfsg-0exp2ubuntu1endless1) eos; urgency=medium + + * debian/control: + - Remove dependencies on libav. + - Added dependencies on gstreamer. + * debian/rules: + - Disable FFMPEG support and enable GSTREAMER support. + + [endlessm/shell#5067] + + -- Mario Fri, 15 May 2015 15:45:05 +0100 + +opencv (2.4.2+dfsg-0exp2ubuntu1) raring; urgency=low + + * Added debian/patches/fix-flann-gcc-c++11-bug.patch: + - Backport from upstream, commit 3df72fe669d27893fae2cffa6287ad8abdcac84f + - Fixes build issues when using gcc and C++11 + + -- Adrien Cunin Thu, 06 Dec 2012 21:06:56 +0100 + opencv (2.4.2+dfsg-0exp2) experimental; urgency=low * Update debian/control. diff -Nru opencv-2.4.2+dfsg/debian/control opencv-2.4.2+dfsg/debian/control --- opencv-2.4.2+dfsg/debian/control 2012-10-07 01:21:56.000000000 +0000 +++ opencv-2.4.2+dfsg/debian/control 2015-05-18 20:28:41.000000000 +0000 @@ -1,13 +1,14 @@ Source: opencv Priority: optional Section: devel -Maintainer: Debian Science Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Science Team Uploaders: Sam Hocevar (Debian packages) , Nobuhiro Iwamatsu Build-Depends: debhelper (>= 8), quilt (>= 0.46-7~), cmake (>= 2.8.7), - libavcodec-dev, libavformat-dev, libswscale-dev, libgtk2.0-dev, + libgtk2.0-dev, libjasper-dev (>= 1.900.1), libjpeg-dev, libpng-dev, @@ -436,9 +437,6 @@ ${shlibs:Depends}, libopencv-imgproc-dev (= ${binary:Version}), libopencv-highgui2.4 (= ${binary:Version}), - libavcodec-dev (>= 0.svn20080206), - libavformat-dev, - libswscale-dev, libgtk2.0-dev, libjasper-dev (>= 1.900.1), libjpeg-dev, diff -Nru opencv-2.4.2+dfsg/debian/patches/fix-flann-gcc-c++11-bug.patch opencv-2.4.2+dfsg/debian/patches/fix-flann-gcc-c++11-bug.patch --- opencv-2.4.2+dfsg/debian/patches/fix-flann-gcc-c++11-bug.patch 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2+dfsg/debian/patches/fix-flann-gcc-c++11-bug.patch 2012-12-06 20:06:41.000000000 +0000 @@ -0,0 +1,13 @@ +Index: opencv-2.4.2+dfsg/modules/flann/include/opencv2/flann/lsh_table.h +=================================================================== +--- opencv-2.4.2+dfsg.orig/modules/flann/include/opencv2/flann/lsh_table.h 2012-06-29 00:56:01.000000000 +0200 ++++ opencv-2.4.2+dfsg/modules/flann/include/opencv2/flann/lsh_table.h 2012-12-06 21:06:39.677797025 +0100 +@@ -193,7 +193,7 @@ + void add(Matrix dataset) + { + #if USE_UNORDERED_MAP +- if (!use_speed_) buckets_space_.rehash((buckets_space_.size() + dataset.rows) * 1.2); ++ buckets_space_.rehash((buckets_space_.size() + dataset.rows) * 1.2); + #endif + // Add the features to the table + for (unsigned int i = 0; i < dataset.rows; ++i) add(i, dataset[i]); diff -Nru opencv-2.4.2+dfsg/debian/patches/series opencv-2.4.2+dfsg/debian/patches/series --- opencv-2.4.2+dfsg/debian/patches/series 2012-07-16 06:28:56.000000000 +0000 +++ opencv-2.4.2+dfsg/debian/patches/series 2012-12-06 20:06:26.000000000 +0000 @@ -2,3 +2,4 @@ 0013_drop_asm_types_h_kfreebsd.patch remove_path_nonfree_doc pkg-config.patch +fix-flann-gcc-c++11-bug.patch diff -Nru opencv-2.4.2+dfsg/debian/rules opencv-2.4.2+dfsg/debian/rules --- opencv-2.4.2+dfsg/debian/rules 2012-07-24 02:32:31.000000000 +0000 +++ opencv-2.4.2+dfsg/debian/rules 2015-05-18 20:28:59.000000000 +0000 @@ -39,7 +39,7 @@ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ -DBUILD_NEW_PYTHON_SUPPORT=ON \ - -DWITH_FFMPEG=ON \ + -DWITH_FFMPEG=OFF \ -DWITH_GSTREAMER=OFF \ -DWITH_GTK=ON \ -DWITH_JASPER=ON \