diffstat of debian/ for opencv_2.3.1-11 opencv_2.4.2-SprezzOS2 changelog | 18 + control | 136 +++++------ libcv2.3.lintian-overrides | 1 libcv2.4.lintian-overrides | 1 libcvaux2.3.lintian-overrides | 1 libcvaux2.4.lintian-overrides | 1 libhighgui2.3.lintian-overrides | 1 libhighgui2.4.lintian-overrides | 1 libopencv-calib3d-dev.install | 1 libopencv-calib3d2.3.install | 1 libopencv-calib3d2.3.lintian-overrides | 1 libopencv-calib3d2.4.install | 1 libopencv-calib3d2.4.lintian-overrides | 1 libopencv-contrib-dev.install | 1 libopencv-contrib2.3.install | 1 libopencv-contrib2.3.lintian-overrides | 1 libopencv-contrib2.4.install | 1 libopencv-contrib2.4.lintian-overrides | 1 libopencv-core-dev.install | 1 libopencv-core2.3.install | 1 libopencv-core2.3.lintian-overrides | 1 libopencv-core2.4.install | 3 libopencv-core2.4.lintian-overrides | 1 libopencv-features2d-dev.install | 1 libopencv-features2d2.3.install | 1 libopencv-features2d2.3.lintian-overrides | 1 libopencv-features2d2.4.install | 1 libopencv-features2d2.4.lintian-overrides | 1 libopencv-flann-dev.install | 1 libopencv-flann2.3.install | 1 libopencv-flann2.3.lintian-overrides | 1 libopencv-flann2.4.install | 1 libopencv-flann2.4.lintian-overrides | 1 libopencv-gpu-dev.install | 1 libopencv-gpu2.3.install | 1 libopencv-gpu2.3.lintian-overrides | 1 libopencv-gpu2.4.install | 1 libopencv-gpu2.4.lintian-overrides | 1 libopencv-highgui-dev.install | 1 libopencv-highgui2.3.install | 1 libopencv-highgui2.3.lintian-overrides | 1 libopencv-highgui2.4.install | 1 libopencv-highgui2.4.lintian-overrides | 1 libopencv-imgproc-dev.install | 1 libopencv-imgproc2.3.install | 1 libopencv-imgproc2.3.lintian-overrides | 1 libopencv-imgproc2.4.install | 1 libopencv-imgproc2.4.lintian-overrides | 1 libopencv-legacy-dev.install | 1 libopencv-legacy2.3.install | 1 libopencv-legacy2.3.lintian-overrides | 1 libopencv-legacy2.4.install | 1 libopencv-legacy2.4.lintian-overrides | 1 libopencv-ml-dev.install | 1 libopencv-ml2.3.install | 1 libopencv-ml2.3.lintian-overrides | 1 libopencv-ml2.4.install | 1 libopencv-ml2.4.lintian-overrides | 1 libopencv-objdetect-dev.install | 1 libopencv-objdetect2.3.install | 1 libopencv-objdetect2.3.lintian-overrides | 1 libopencv-objdetect2.4.install | 1 libopencv-objdetect2.4.lintian-overrides | 1 libopencv-video-dev.install | 1 libopencv-video2.3.install | 1 libopencv-video2.3.lintian-overrides | 1 libopencv-video2.4.install | 1 libopencv-video2.4.lintian-overrides | 1 opencv-doc.install | 2 patches/0005-build-static-libs.patch | 74 ----- patches/0011_optimize_i486.patch | 26 -- patches/0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch | 125 ---------- patches/0014_fix_ftbfs_libav0.8.patch | 18 - patches/series | 4 rules | 15 - 75 files changed, 126 insertions(+), 360 deletions(-) --- opencv-2.3.1/debian/changelog 2012-06-28 02:36:19.000000000 +0000 +++ opencv-2.4.2/debian/changelog 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,21 @@ +opencv (2.4.2-SprezzOS2) UNRELEASED; urgency=low + + * Dep on libpng-dev instead of libpng12-dev, allowing libpng15-dev + + -- nick black Mon, 29 Oct 2012 01:27:19 -0400 + +opencv (2.4.2-SprezzOS1) unstable; urgency=low + + * New upstream version 2.4.2 + + -- nick black Tue, 09 Oct 2012 22:41:39 -0400 + +opencv (2.3.1-SprezzOS1) unstable; urgency=low + + * SprezzOS build, prep for 2.4.0 + + -- nick black Tue, 09 Oct 2012 18:16:28 -0400 + opencv (2.3.1-11) unstable; urgency=high * Update debian/control. --- opencv-2.3.1/debian/control 2012-06-28 02:36:53.000000000 +0000 +++ opencv-2.4.2/debian/control 2012-10-29 05:43:11.000000000 +0000 @@ -1,17 +1,19 @@ Source: opencv Priority: optional Section: devel -Maintainer: Debian Science Team +Maintainer: Nick Black +XSBC-Original-Maintainer: Debian Science Team Uploaders: Sam Hocevar (Debian packages) , Nobuhiro Iwamatsu Build-Depends: debhelper (>= 8), cmake, - libavcodec-dev, libavformat-dev, libswscale-dev, libgtk2.0-dev, + libavcodec-dev, libavformat-dev, libswscale-dev, libgtk-3-dev, libjasper-dev (>= 1.900.1), libjpeg-dev, libpng-dev, libtiff4-dev (>= 3.9.4), libopenexr-dev (>= 1.4.0), libraw1394-dev [linux-any], + nvidia-cuda-dev, libdc1394-22-dev [linux-any], libv4l-dev [linux-any], zlib1g-dev (>= 1.2.5), @@ -20,6 +22,7 @@ python-dev, swig, python-support (>= 0.4.1), python-numpy, + libgstreamer1.0-dev, python-sphinx, texlive-fonts-extra, texlive-latex-extra, texlive-latex-recommended, latex-xcolor, texlive-fonts-recommended @@ -59,7 +62,8 @@ libopencv-objdetect-dev, libopencv-legacy-dev, libopencv-video-dev, - libopencv-ml-dev + libopencv-ml-dev, + nvidia-cuda-dev Conflicts: libcvaux-dev (<= 2.1.0-7), libhighgui-dev (<= 2.1.0-7) Description: Translation package for libcv-dev This package provide files for translation from libcv-dev to @@ -78,20 +82,20 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libcv2.3 +Package: libcv2.4 Architecture: any Depends: ${misc:Depends}, - libopencv-core2.3, - libopencv-imgproc2.3, - libopencv-flann2.3, - libopencv-features2d2.3, - libopencv-calib3d2.3, - libopencv-objdetect2.3, - libopencv-legacy2.3, - libopencv-video2.3, - libopencv-ml2.3 + libopencv-core2.4, + libopencv-imgproc2.4, + libopencv-flann2.4, + libopencv-features2d2.4, + libopencv-calib3d2.4, + libopencv-objdetect2.4, + libopencv-legacy2.4, + libopencv-video2.4, + libopencv-ml2.4 Description: computer vision library - libcv* translation package - This package provide files for translation from libcv2.1 to libcv2.3. + This package provide files for translation from libcv2.1 to libcv2.4. . The Open Computer Vision Library is a collection of algorithms and sample code for various computer vision problems. The library is compatible with @@ -125,12 +129,12 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libhighgui2.3 +Package: libhighgui2.4 Architecture: any Depends: ${misc:Depends}, - libopencv-highgui2.3 + libopencv-highgui2.4 Description: computer vision library - libhighgui translation package - This package provide files for translation from libhighgui2.1 to libhighgui2.3. + This package provide files for translation from libhighgui2.1 to libhighgui2.4. . The Open Computer Vision Library is a collection of algorithms and sample code for various computer vision problems. The library is compatible with @@ -168,19 +172,19 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libcvaux2.3 +Package: libcvaux2.4 Architecture: any Depends: ${misc:Depends}, - libopencv-core2.3, - libopencv-imgproc2.3, - libopencv-features2d2.3, - libopencv-calib3d2.3, - libopencv-objdetect2.3, - libopencv-legacy2.3, - libopencv-video2.3, - libopencv-contrib2.3 + libopencv-core2.4, + libopencv-imgproc2.4, + libopencv-features2d2.4, + libopencv-calib3d2.4, + libopencv-objdetect2.4, + libopencv-legacy2.4, + libopencv-video2.4, + libopencv-contrib2.4 Description: computer vision library - libcvaux translation package - This package provide files for translation from libcvaux2.1 to libcvaux2.3. + This package provide files for translation from libcvaux2.1 to libcvaux2.4. . The Open Computer Vision Library is a collection of algorithms and sample code for various computer vision problems. The library is compatible with @@ -231,7 +235,7 @@ Package: libopencv-core-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-core2.3 (= ${binary:Version}), +Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-core2.4 (= ${binary:Version}), zlib1g-dev ,pkg-config Description: development files for libopencv-core This package contains the header files and static library needed to compile @@ -247,7 +251,7 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-core2.3 +Package: libopencv-core2.4 Section: libs Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} @@ -269,7 +273,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-core-dev (= ${binary:Version}), - libopencv-ml2.3 (= ${binary:Version}), + libopencv-ml2.4 (= ${binary:Version}), pkg-config Description: development files for libopencv-ml This package contains the header files and static library needed to compile @@ -285,11 +289,11 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-ml2.3 +Package: libopencv-ml2.4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-core2.3 (= ${binary:Version}) + libopencv-core2.4 (= ${binary:Version}) Description: computer vision Machine Learning library This package contains the OpenCV (Open Computer Vision) Machine Learning runtime libraries. @@ -309,7 +313,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-core-dev (= ${binary:Version}), - libopencv-imgproc2.3 (= ${binary:Version}), + libopencv-imgproc2.4 (= ${binary:Version}), pkg-config Description: development files for libopencv-imgproc This package contains the header files and static library needed to compile @@ -325,11 +329,11 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-imgproc2.3 +Package: libopencv-imgproc2.4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-core2.3 (= ${binary:Version}) + libopencv-core2.4 (= ${binary:Version}) Description: computer vision Image Processing library This package contains the OpenCV (Open Computer Vision) Image Processing runtime libraries. @@ -349,7 +353,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-imgproc-dev (= ${binary:Version}), - libopencv-video2.3 (= ${binary:Version}), + libopencv-video2.4 (= ${binary:Version}), pkg-config Description: development files for libopencv-video This package contains the header files and static library needed to compile @@ -365,11 +369,11 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-video2.3 +Package: libopencv-video2.4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-imgproc2.3 (= ${binary:Version}) + libopencv-imgproc2.4 (= ${binary:Version}) Description: computer vision Video analysis library This package contains the OpenCV (Open Computer Vision) Video analysis runtime libraries. @@ -389,7 +393,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-calib3d-dev (= ${binary:Version}), - libopencv-objdetect2.3 (= ${binary:Version}), + libopencv-objdetect2.4 (= ${binary:Version}), pkg-config Description: development files for libopencv-objdetect This package contains the header files and static library needed to compile @@ -405,11 +409,11 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-objdetect2.3 +Package: libopencv-objdetect2.4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-calib3d2.3 (= ${binary:Version}) + libopencv-calib3d2.4 (= ${binary:Version}) Description: computer vision Object Detection library This package contains the OpenCV (Open Computer Vision) Object Detection runtime libraries. @@ -429,7 +433,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-core-dev (= ${binary:Version}), - libopencv-gpu2.3 (= ${binary:Version}), + libopencv-gpu2.4 (= ${binary:Version}), pkg-config Description: development files for libopencv-gpu This package contains the header files and static library needed to compile @@ -445,11 +449,11 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-gpu2.3 +Package: libopencv-gpu2.4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-core2.3 (= ${binary:Version}), + libopencv-core2.4 (= ${binary:Version}), Description: computer vision GPU Processing library This package contains the OpenCV (Open Computer Vision) GPU Processing runtime libraries. @@ -470,14 +474,14 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-imgproc-dev (= ${binary:Version}), - libopencv-highgui2.3 (= ${binary:Version}), + libopencv-highgui2.4 (= ${binary:Version}), libavcodec-dev (>= 0.svn20080206), libavformat-dev, libswscale-dev, - libgtk2.0-dev, + libgtk-3-dev, libjasper-dev (>= 1.900.1), libjpeg-dev, - libpng12-dev, + libpng-dev, libtiff4-dev (>= 3.9.4), libopenexr-dev (>= 1.4.0), libraw1394-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], @@ -498,12 +502,12 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-highgui2.3 +Package: libopencv-highgui2.4 Section: libs Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - libopencv-imgproc2.3 (= ${binary:Version}) + libopencv-imgproc2.4 (= ${binary:Version}) 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. @@ -523,7 +527,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-features2d-dev (= ${binary:Version}), - libopencv-calib3d2.3 (= ${binary:Version}), + libopencv-calib3d2.4 (= ${binary:Version}), pkg-config Description: development files for libopencv-calib3d This package contains the header files and static library needed to compile @@ -539,11 +543,11 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-calib3d2.3 +Package: libopencv-calib3d2.4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-features2d2.3 (= ${binary:Version}), + libopencv-features2d2.4 (= ${binary:Version}), Description: computer vision Camera Calibration library This package contains the OpenCV (Open Computer Vision) Camera Calibration runtime libraries. @@ -563,7 +567,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-core-dev (= ${binary:Version}), - libopencv-flann2.3 (= ${binary:Version}), + libopencv-flann2.4 (= ${binary:Version}), pkg-config Description: development files for libopencv-flann This package contains the header files and static library needed to compile @@ -580,11 +584,11 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-flann2.3 +Package: libopencv-flann2.4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-core2.3 (= ${binary:Version}), + libopencv-core2.4 (= ${binary:Version}), Description: computer vision Clustering and Search in Multi-Dimensional spaces library This package contains the OpenCV (Open Computer Vision) clustering and search in Multi-Dimensional spaces runtime libraries. @@ -605,7 +609,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-flann-dev (= ${binary:Version}), libopencv-highgui-dev (= ${binary:Version}), - libopencv-features2d2.3 (= ${binary:Version}), + libopencv-features2d2.4 (= ${binary:Version}), pkg-config Description: development files for libopencv-features2d This package contains the header files and static library needed to compile @@ -622,12 +626,12 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-features2d2.3 +Package: libopencv-features2d2.4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-flann2.3 (= ${binary:Version}), - libopencv-highgui2.3 (= ${binary:Version}), + libopencv-flann2.4 (= ${binary:Version}), + libopencv-highgui2.4 (= ${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. @@ -648,7 +652,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-video-dev (= ${binary:Version}), libopencv-calib3d-dev (= ${binary:Version}), - libopencv-legacy2.3 (= ${binary:Version}), + libopencv-legacy2.4 (= ${binary:Version}), pkg-config Description: development files for libopencv-legacy This package contains the header files and static library needed to compile @@ -664,12 +668,12 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-legacy2.3 +Package: libopencv-legacy2.4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-video2.3 (= ${binary:Version}), - libopencv-calib3d2.3 (= ${binary:Version}), + libopencv-video2.4 (= ${binary:Version}), + libopencv-calib3d2.4 (= ${binary:Version}), Description: computer vision legacy library This package contains the OpenCV (Open Computer Vision) legacy runtime libraries. @@ -689,7 +693,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-calib3d-dev (= ${binary:Version}), - libopencv-contrib2.3 (= ${binary:Version}), + libopencv-contrib2.4 (= ${binary:Version}), pkg-config Description: development files for libopencv-contrib This package contains the header files and static library needed to compile @@ -705,11 +709,11 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-contrib2.3 +Package: libopencv-contrib2.4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-calib3d2.3 (= ${binary:Version}) + libopencv-calib3d2.4 (= ${binary:Version}) Description: computer vision contrib library This package contains the OpenCV (Open Computer Vision) contrib runtime libraries. --- opencv-2.3.1/debian/libcv2.3.lintian-overrides 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libcv2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libcv2.3: empty-binary-package --- opencv-2.3.1/debian/libcv2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libcv2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libcv2.3: empty-binary-package --- opencv-2.3.1/debian/libcvaux2.3.lintian-overrides 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libcvaux2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libcvaux2.3: empty-binary-package --- opencv-2.3.1/debian/libcvaux2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libcvaux2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libcvaux2.3: empty-binary-package --- opencv-2.3.1/debian/libhighgui2.3.lintian-overrides 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libhighgui2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libhighgui2.3: empty-binary-package --- opencv-2.3.1/debian/libhighgui2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libhighgui2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libhighgui2.3: empty-binary-package --- opencv-2.3.1/debian/libopencv-calib3d-dev.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-calib3d-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,2 @@ usr/include/opencv2/calib3d/* -usr/lib/libopencv_calib3d.a usr/lib/libopencv_calib3d.so --- opencv-2.3.1/debian/libopencv-calib3d2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-calib3d2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_calib3d.so.* --- opencv-2.3.1/debian/libopencv-calib3d2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-calib3d2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-calib3d2.3: hardening-no-fortify-functions usr/lib/libopencv_calib3d.so.2.3.1 --- opencv-2.3.1/debian/libopencv-calib3d2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-calib3d2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libopencv_calib3d.so.* --- opencv-2.3.1/debian/libopencv-calib3d2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-calib3d2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-calib3d2.3: hardening-no-fortify-functions usr/lib/libopencv_calib3d.so.2.3.1 --- opencv-2.3.1/debian/libopencv-contrib-dev.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-contrib-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,2 @@ usr/include/opencv2/contrib/* -usr/lib/libopencv_contrib.a usr/lib/libopencv_contrib.so --- opencv-2.3.1/debian/libopencv-contrib2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-contrib2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_contrib.so.* --- opencv-2.3.1/debian/libopencv-contrib2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-contrib2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-contrib2.3: hardening-no-fortify-functions usr/lib/libopencv_contrib.so.2.3.1 --- opencv-2.3.1/debian/libopencv-contrib2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-contrib2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libopencv_contrib.so.* --- opencv-2.3.1/debian/libopencv-contrib2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-contrib2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-contrib2.3: hardening-no-fortify-functions usr/lib/libopencv_contrib.so.2.3.1 --- opencv-2.3.1/debian/libopencv-core-dev.install 2012-05-22 03:10:54.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-core-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -2,5 +2,4 @@ usr/include/opencv2/core/* usr/include/opencv2/opencv.hpp # libraries -usr/lib/libopencv_core.a usr/lib/libopencv_core.so --- opencv-2.3.1/debian/libopencv-core2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-core2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_core.so.* --- opencv-2.3.1/debian/libopencv-core2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-core2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-core2.3: hardening-no-fortify-functions usr/lib/libopencv_core.so.2.3.1 --- opencv-2.3.1/debian/libopencv-core2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-core2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1,3 @@ +usr/lib/libopencv_core.so.* +usr/lib/libopencv_photo.so.* +usr/lib/libopencv_nonfree.so.* --- opencv-2.3.1/debian/libopencv-core2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-core2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-core2.3: hardening-no-fortify-functions usr/lib/libopencv_core.so.2.3.1 --- opencv-2.3.1/debian/libopencv-features2d-dev.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-features2d-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,2 @@ usr/include/opencv2/features2d/* -usr/lib/libopencv_features2d.a usr/lib/libopencv_features2d.so --- opencv-2.3.1/debian/libopencv-features2d2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-features2d2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_features2d.so.* --- opencv-2.3.1/debian/libopencv-features2d2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-features2d2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-features2d2.3: hardening-no-fortify-functions usr/lib/libopencv_features2d.so.2.3.1 --- opencv-2.3.1/debian/libopencv-features2d2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-features2d2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libopencv_features2d.so.* --- opencv-2.3.1/debian/libopencv-features2d2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-features2d2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-features2d2.3: hardening-no-fortify-functions usr/lib/libopencv_features2d.so.2.3.1 --- opencv-2.3.1/debian/libopencv-flann-dev.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-flann-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,2 @@ usr/include/opencv2/flann/* -usr/lib/libopencv_flann.a usr/lib/libopencv_flann.so --- opencv-2.3.1/debian/libopencv-flann2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-flann2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_flann.so.* --- opencv-2.3.1/debian/libopencv-flann2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-flann2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-flann2.3: hardening-no-fortify-functions usr/lib/libopencv_flann.so.2.3.1 --- opencv-2.3.1/debian/libopencv-flann2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-flann2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libopencv_flann.so.* --- opencv-2.3.1/debian/libopencv-flann2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-flann2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-flann2.3: hardening-no-fortify-functions usr/lib/libopencv_flann.so.2.3.1 --- opencv-2.3.1/debian/libopencv-gpu-dev.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-gpu-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,2 @@ usr/include/opencv2/gpu/* -usr/lib/libopencv_gpu.a usr/lib/libopencv_gpu.so --- opencv-2.3.1/debian/libopencv-gpu2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-gpu2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_gpu.so.* --- opencv-2.3.1/debian/libopencv-gpu2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-gpu2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-gpu2.3: hardening-no-fortify-functions usr/lib/libopencv_gpu.so.2.3.1 --- opencv-2.3.1/debian/libopencv-gpu2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-gpu2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libopencv_gpu.so.* --- opencv-2.3.1/debian/libopencv-gpu2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-gpu2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-gpu2.3: hardening-no-fortify-functions usr/lib/libopencv_gpu.so.2.3.1 --- opencv-2.3.1/debian/libopencv-highgui-dev.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-highgui-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,2 @@ usr/include/opencv2/highgui/* -usr/lib/libopencv_highgui.a usr/lib/libopencv_highgui.so --- opencv-2.3.1/debian/libopencv-highgui2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-highgui2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_highgui.so.* --- opencv-2.3.1/debian/libopencv-highgui2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-highgui2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-highgui2.3: hardening-no-fortify-functions usr/lib/libopencv_highgui.so.2.3.1 --- opencv-2.3.1/debian/libopencv-highgui2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-highgui2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libopencv_highgui.so.* --- opencv-2.3.1/debian/libopencv-highgui2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-highgui2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-highgui2.3: hardening-no-fortify-functions usr/lib/libopencv_highgui.so.2.3.1 --- opencv-2.3.1/debian/libopencv-imgproc-dev.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-imgproc-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,2 @@ usr/include/opencv2/imgproc/* -usr/lib/libopencv_imgproc.a usr/lib/libopencv_imgproc.so --- opencv-2.3.1/debian/libopencv-imgproc2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-imgproc2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_imgproc.so.* --- opencv-2.3.1/debian/libopencv-imgproc2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-imgproc2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-imgproc2.3: hardening-no-fortify-functions usr/lib/libopencv_imgproc.so.2.3.1 --- opencv-2.3.1/debian/libopencv-imgproc2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-imgproc2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libopencv_imgproc.so.* --- opencv-2.3.1/debian/libopencv-imgproc2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-imgproc2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-imgproc2.3: hardening-no-fortify-functions usr/lib/libopencv_imgproc.so.2.3.1 --- opencv-2.3.1/debian/libopencv-legacy-dev.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-legacy-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,2 @@ usr/include/opencv2/legacy/* -usr/lib/libopencv_legacy.a usr/lib/libopencv_legacy.so --- opencv-2.3.1/debian/libopencv-legacy2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-legacy2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_legacy.so.* --- opencv-2.3.1/debian/libopencv-legacy2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-legacy2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-legacy2.3: hardening-no-fortify-functions usr/lib/libopencv_legacy.so.2.3.1 --- opencv-2.3.1/debian/libopencv-legacy2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-legacy2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libopencv_legacy.so.* --- opencv-2.3.1/debian/libopencv-legacy2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-legacy2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-legacy2.3: hardening-no-fortify-functions usr/lib/libopencv_legacy.so.2.3.1 --- opencv-2.3.1/debian/libopencv-ml-dev.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-ml-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,2 @@ usr/include/opencv2/ml/* -usr/lib/libopencv_ml.a usr/lib/libopencv_ml.so --- opencv-2.3.1/debian/libopencv-ml2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-ml2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_ml.so.* --- opencv-2.3.1/debian/libopencv-ml2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-ml2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-ml2.3: hardening-no-fortify-functions usr/lib/libopencv_ml.so.2.3.1 --- opencv-2.3.1/debian/libopencv-ml2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-ml2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libopencv_ml.so.* --- opencv-2.3.1/debian/libopencv-ml2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-ml2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-ml2.3: hardening-no-fortify-functions usr/lib/libopencv_ml.so.2.3.1 --- opencv-2.3.1/debian/libopencv-objdetect-dev.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-objdetect-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,2 @@ usr/include/opencv2/objdetect/* -usr/lib/libopencv_objdetect.a usr/lib/libopencv_objdetect.so --- opencv-2.3.1/debian/libopencv-objdetect2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-objdetect2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_objdetect.so.* --- opencv-2.3.1/debian/libopencv-objdetect2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-objdetect2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-objdetect2.3: hardening-no-fortify-functions usr/lib/libopencv_objdetect.so.2.3.1 --- opencv-2.3.1/debian/libopencv-objdetect2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-objdetect2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libopencv_objdetect.so.* --- opencv-2.3.1/debian/libopencv-objdetect2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-objdetect2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-objdetect2.3: hardening-no-fortify-functions usr/lib/libopencv_objdetect.so.2.3.1 --- opencv-2.3.1/debian/libopencv-video-dev.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-video-dev.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,3 +1,2 @@ usr/include/opencv2/video/* -usr/lib/libopencv_video.a usr/lib/libopencv_video.so --- opencv-2.3.1/debian/libopencv-video2.3.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-video2.3.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libopencv_video.so.* --- opencv-2.3.1/debian/libopencv-video2.3.lintian-overrides 2012-06-28 02:35:06.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-video2.3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libopencv-video2.3: hardening-no-fortify-functions usr/lib/libopencv_video.so.2.3.1 --- opencv-2.3.1/debian/libopencv-video2.4.install 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-video2.4.install 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libopencv_video.so.* --- opencv-2.3.1/debian/libopencv-video2.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ opencv-2.4.2/debian/libopencv-video2.4.lintian-overrides 2012-10-29 05:43:11.000000000 +0000 @@ -0,0 +1 @@ +libopencv-video2.3: hardening-no-fortify-functions usr/lib/libopencv_video.so.2.3.1 --- opencv-2.3.1/debian/opencv-doc.install 2012-05-22 03:04:20.000000000 +0000 +++ opencv-2.4.2/debian/opencv-doc.install 2012-10-29 05:43:11.000000000 +0000 @@ -1,4 +1,4 @@ usr/share/OpenCV/doc/* usr/share/doc/opencv-doc/ -usr/share/opencv/samples/* usr/share/doc/opencv-doc/examples/ +usr/share/OpenCV/samples/* usr/share/doc/opencv-doc/examples/ samples/python usr/share/doc/opencv-doc/examples/ debian/samples/c/Makefile.debian usr/share/doc/opencv-doc/examples/c/ --- opencv-2.3.1/debian/patches/0005-build-static-libs.patch 2012-05-22 03:04:19.000000000 +0000 +++ opencv-2.4.2/debian/patches/0005-build-static-libs.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -From 8cc03516da0b5c93079d5184a73bce438c77d18a Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Wed, 24 Aug 2011 12:06:56 +0900 -Subject: Support static library. - -Signed-off-by: Nobuhiro Iwamatsu ---- - OpenCVModule.cmake | 4 +++- - modules/gpu/CMakeLists.txt | 2 ++ - modules/highgui/CMakeLists.txt | 2 ++ - 3 files changed, 7 insertions(+), 1 deletions(-) - -diff --git a/OpenCVModule.cmake b/OpenCVModule.cmake -index 53a24bd..be077f7 100644 ---- a/OpenCVModule.cmake -+++ b/OpenCVModule.cmake -@@ -47,11 +47,13 @@ macro(define_opencv_module name) - file(GLOB lib_hdrs "include/opencv2/${name}/*.h*") - source_group("Include" FILES ${lib_hdrs}) - -- set(the_target "opencv_${name}") -+ set(the_target "opencv_${name}") -+ set(the_target_s "opencv_${name}_s") - if (${name} MATCHES "ts" AND MINGW) - add_library(${the_target} STATIC ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs}) - else() - add_library(${the_target} ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs}) -+ add_library(${the_target_s} STATIC ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs}) - endif() - - # For dynamic link numbering convenions -diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt -index b9f3666..8de8ecf 100644 ---- a/modules/gpu/CMakeLists.txt -+++ b/modules/gpu/CMakeLists.txt -@@ -1,6 +1,7 @@ - set(name "gpu") - - set(the_target "opencv_${name}") -+set(the_target_s "opencv_${name}_s") - project(${the_target}) - - set(DEPS "opencv_core" "opencv_imgproc" "opencv_objdetect" "opencv_features2d" "opencv_flann" "opencv_calib3d") #"opencv_features2d" "opencv_flann" "opencv_objdetect" - only headers needed -@@ -86,6 +87,7 @@ foreach(d ${DEPS}) - endforeach() - - add_library(${the_target} ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs} ${lib_cuda} ${lib_cuda_hdrs} ${lib_device_hdrs} ${lib_device_hdrs_detail} ${ncv_srcs} ${ncv_hdrs} ${ncv_cuda} ${cuda_objs}) -+add_library(${the_target_s} STATIC ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs} ${lib_cuda} ${lib_cuda_hdrs} ${lib_device_hdrs} ${lib_device_hdrs_detail} ${ncv_srcs} ${ncv_hdrs} ${ncv_cuda} ${cuda_objs}) - - # For dynamic link numbering convenions - set_target_properties(${the_target} PROPERTIES -diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt -index b0975d7..e5c3341 100644 ---- a/modules/highgui/CMakeLists.txt -+++ b/modules/highgui/CMakeLists.txt -@@ -254,6 +254,7 @@ set(lib_srcs ${highgui_srcs} ${grfmt_srcs}) - # Define the library target: - # ---------------------------------------------------------------------------------- - set(the_target "opencv_highgui") -+set(the_target_s "opencv_highgui_s") - - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" - "${CMAKE_CURRENT_SOURCE_DIR}/../core/include" -@@ -266,6 +267,7 @@ if(WIN32) - endif() - - add_library(${the_target} ${lib_srcs} ${highgui_hdrs} ${grfmt_hdrs} ${highgui_ext_hdrs}) -+add_library(${the_target_s} STATIC ${lib_srcs} ${highgui_hdrs} ${grfmt_hdrs} ${highgui_ext_hdrs}) - - if (BUILD_SHARED_LIBS) - add_definitions(-DHIGHGUI_EXPORTS) --- -1.7.5.4 - --- opencv-2.3.1/debian/patches/0011_optimize_i486.patch 2012-05-22 03:04:19.000000000 +0000 +++ opencv-2.4.2/debian/patches/0011_optimize_i486.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From 629055acc3d2070c051aa8bd7b85f59c13b4d879 Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Wed, 24 Aug 2011 12:13:20 +0900 -Subject: Optimize of i386 changed from 686 to 486. - -Signed-off-by: Nobuhiro Iwamatsu ---- - CMakeLists.txt | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0709624..8aa2c7e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1175,7 +1175,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) - endif() - - if(X86 AND NOT MINGW64 AND NOT X86_64 AND NOT APPLE) -- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i686") -+ set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i486") - endif() - - # Other optimizations --- -1.7.5.4 - --- opencv-2.3.1/debian/patches/0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch 2012-05-22 03:04:19.000000000 +0000 +++ opencv-2.4.2/debian/patches/0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,125 +0,0 @@ -diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp -index 14ed8b7..02d89cc 100644 ---- a/modules/highgui/src/cap_ffmpeg_impl.hpp -+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp -@@ -146,6 +146,12 @@ extern "C" { - #include - #endif - -+#if LIBAVFORMAT_BUILD < AV_VERSION_INT(53, 2, 0) -+#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO -+#endif -+#ifndef PKT_FLAG_KEY -+#define PKT_FLAG_KEY AV_PKT_FLAG_KEY -+#endif - int get_number_of_cpus(void) - { - #if defined WIN32 || defined _WIN32 -@@ -467,7 +473,6 @@ void CvCapture_FFMPEG::close() - init(); - } - -- - /* - Used to reopen a video if the slower fallback function for seeking is used. - */ -@@ -540,10 +545,6 @@ bool CvCapture_FFMPEG::open( const char* _filename ) - - avcodec_thread_init(enc, get_number_of_cpus()); - -- #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 4, 0) -- #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO -- #endif -- - if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) { - AVCodec *codec = avcodec_find_decoder(enc->codec_id); - if (!codec || -@@ -596,6 +597,24 @@ exit_func: - return valid; - } - -+#if LIBAVFORMAT_BUILD >= (53<<16 | 0<<8 | 0) -+ /* As defined when compiled against libav-0.7 from Ubuntu 11.10 Oneiric */ -+ /*Gal Shalif: temporary add a backward compatible function - till OpenCV is properly ported to compile against ffmpeg 0.7 */ -+ /* Gal Shalif: code is copy from Ubuntu 11.04 Natty libav-0.6.2/libavcodec/utils.c */ -+int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, -+ int *got_picture_ptr, -+ uint8_t *buf, int buf_size) -+{ -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ avpkt.data = buf; -+ avpkt.size = buf_size; -+ // HACK for CorePNG to decode as normal PNG by default -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ return avcodec_decode_video2(avctx, picture, got_picture_ptr, &avpkt); -+} -+#endif /* LIBAVFORMAT_BUILD >= (53<<16 | 0<<8 | 0) */ -+ - - bool CvCapture_FFMPEG::grabFrame() - { -@@ -631,7 +650,7 @@ bool CvCapture_FFMPEG::grabFrame() - continue; - } - --#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0) -+#if LIBAVFORMAT_BUILD >= AV_VERSION_INT(53, 4, 0) - avcodec_decode_video2(video_st->codec, picture, &got_picture, &packet); - #else - #if LIBAVFORMAT_BUILD > 4628 -@@ -879,9 +898,22 @@ struct CvVideoWriter_FFMPEG - #endif - }; - -+#if LIBAVFORMAT_BUILD >= (53<<16 | 0<<8 | 0) -+ /* As defined when compiled against libav-0.7 from Ubuntu 11.10 Oneiric */ -+ /* Gal Shalif: temporary add a backward compatible define -+ * - till OpenCV is properly ported to compile against ffmpeg 0.7 */ -+ -+ /* Gal Shalif: code is copy from Ubuntu 11.04 Natty libav-0.6.2/libavutil/error.h -+ * and is enclosed within LIBAVUTIL_VERSION_MAJOR < 51 ... #endif */ -+ #define AVERROR_NUMEXPECTED AVERROR(EDOM) ///< Number syntax expected in filename -+ #define AVERROR_NOFMT AVERROR(EILSEQ) ///< Unknown format -+ #define AVERROR_IO AVERROR(EIO) ///< I/O error -+ #define AVERROR_NOMEM AVERROR(ENOMEM) ///< Not enough memory -+#endif /* LIBAVFORMAT_BUILD >= (53<<16 | 0<<8 | 0) */ -+ - static const char * icvFFMPEGErrStr(int err) - { --#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0) -+#if LIBAVFORMAT_BUILD >= AV_VERSION_INT(53, 4, 0) - switch(err) { - case AVERROR_BSF_NOT_FOUND: - return "Bitstream filter not found"; -@@ -1106,11 +1138,7 @@ int icv_av_write_frame_FFMPEG( AVFormatContext * oc, AVStream * video_st, uint8_ - AVPacket pkt; - av_init_packet(&pkt); - -- #ifndef PKT_FLAG_KEY -- #define PKT_FLAG_KEY AV_PKT_FLAG_KEY -- #endif -- -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= PKT_FLAG_KEY; - pkt.stream_index= video_st->index; - pkt.data= (uint8_t *)picture; - pkt.size= sizeof(AVPicture); -@@ -1333,7 +1361,7 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc, - - /* auto detect the output format from the name and fourcc code. */ - --#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0) -+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0) - fmt = av_guess_format(NULL, filename, NULL); - #else - fmt = guess_format(NULL, filename, NULL); -@@ -1361,7 +1389,7 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc, - #endif - - // alloc memory for context --#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0) -+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0) - oc = avformat_alloc_context(); - #else - oc = av_alloc_format_context(); --- opencv-2.3.1/debian/patches/0014_fix_ftbfs_libav0.8.patch 2012-05-22 03:04:19.000000000 +0000 +++ opencv-2.4.2/debian/patches/0014_fix_ftbfs_libav0.8.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: FTBFS with libav 0.8 -Forwarded: not yet -Author: Nobuhiro Iwamatsu -Bug-Debian: http://bugs.debian.org/654220 -Last-Update: 2012-01-27 - -diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp -index 14ed8b7..f1e0fcb 100644 ---- a/modules/highgui/src/cap_ffmpeg_impl.hpp -+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp -@@ -108,6 +108,7 @@ extern "C" { - #if defined(HAVE_LIBSWSCALE_SWSCALE_H) - #include - #endif -+#include - - #endif - --- opencv-2.3.1/debian/patches/series 2012-05-22 03:04:19.000000000 +0000 +++ opencv-2.4.2/debian/patches/series 2012-10-29 05:43:11.000000000 +0000 @@ -1,6 +1,2 @@ -0005-build-static-libs.patch 0007-typos-in-strings-docs.patch -0011_optimize_i486.patch -0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch 0013_drop_asm_types_h_kfreebsd.patch -0014_fix_ftbfs_libav0.8.patch --- opencv-2.3.1/debian/rules 2012-06-28 03:05:30.000000000 +0000 +++ opencv-2.4.2/debian/rules 2012-10-29 05:43:11.000000000 +0000 @@ -26,6 +26,7 @@ CMAKE_ARCH_FLAGS += -DWITH_TBB=OFF endif +# why can't we just use libavformat instead of ffmpeg? FIXME CMAKE_FLAGS = \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -40,8 +41,8 @@ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ -DBUILD_NEW_PYTHON_SUPPORT=ON \ - -DWITH_FFMPEG=ON \ - -DWITH_GSTREAMER=OFF \ + -DWITH_FFMPEG=OFF \ + -DWITH_GSTREAMER=ON \ -DWITH_GTK=ON \ -DWITH_JASPER=ON \ -DWITH_JPEG=ON \ @@ -68,10 +69,10 @@ dh_auto_configure -- $(CMAKE_FLAGS) $(CMAKE_ARCH_FLAGS) override_dh_install: - -rm --verbose -rf debian/tmp/usr/share/opencv/samples/octave # just in case - -rm --verbose -f debian/tmp/usr/share/opencv/samples/c/cvsample.dsp + -rm --verbose -rf debian/tmp/usr/share/OpenCV/samples/octave # just in case + -rm --verbose -f debian/tmp/usr/share/OpenCV/samples/c/cvsample.dsp -rm --verbose -f debian/tmp/usr/share/OpenCV/doc/license.txt - chmod --verbose +x debian/tmp/usr/share/opencv/samples/c/build_all.sh - for f in $$(ls obj-*/lib/libopencv_*_s.a); do \ - cp --verbose --preserve=mode $$f debian/tmp/usr/lib/$$(basename $$f _s.a).a; done + chmod --verbose +x debian/tmp/usr/share/OpenCV/samples/c/build_all.sh + #for f in $$(ls obj-*/lib/libopencv_*_s.a); do \ + # cp --verbose --preserve=mode $$f debian/tmp/usr/lib/$$(basename $$f _s.a).a; done dh_install -O--buildsystem=cmake --list-missing