r45338 - /packages/opencv/tags/2.3.1-12/debian/
iwamatsu at users.alioth.debian.org
iwamatsu at users.alioth.debian.org
Mon Aug 27 22:25:51 UTC 2012
Author: iwamatsu
Date: Mon Aug 27 22:25:50 2012
New Revision: 45338
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45338
Log:
Add necessary files for debian packages
Added:
packages/opencv/tags/2.3.1-12/debian/0005-build-static-libs.patch
packages/opencv/tags/2.3.1-12/debian/0007-typos-in-strings-docs.patch
packages/opencv/tags/2.3.1-12/debian/0011_optimize_i486.patch
packages/opencv/tags/2.3.1-12/debian/0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch
packages/opencv/tags/2.3.1-12/debian/0013_drop_asm_types_h_kfreebsd.patch
packages/opencv/tags/2.3.1-12/debian/0014_fix_ftbfs_libav0.8.patch
packages/opencv/tags/2.3.1-12/debian/changelog
packages/opencv/tags/2.3.1-12/debian/libopencv-calib3d2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-contrib2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-core2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-dev.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-features2d2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-flann2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-gpu2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-highgui2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-imgproc2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-legacy2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-ml2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-objdetect2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/libopencv-video2.3.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/python-opencv.lintian-overrides
packages/opencv/tags/2.3.1-12/debian/series
packages/opencv/tags/2.3.1-12/debian/switch_multiarch.patch
Added: packages/opencv/tags/2.3.1-12/debian/0005-build-static-libs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/0005-build-static-libs.patch?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/0005-build-static-libs.patch (added)
+++ packages/opencv/tags/2.3.1-12/debian/0005-build-static-libs.patch Mon Aug 27 22:25:50 2012
@@ -1,0 +1,74 @@
+From 8cc03516da0b5c93079d5184a73bce438c77d18a Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Date: Wed, 24 Aug 2011 12:06:56 +0900
+Subject: Support static library.
+
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+---
+ 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
+
Added: packages/opencv/tags/2.3.1-12/debian/0007-typos-in-strings-docs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/0007-typos-in-strings-docs.patch?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/0007-typos-in-strings-docs.patch (added)
+++ packages/opencv/tags/2.3.1-12/debian/0007-typos-in-strings-docs.patch Mon Aug 27 22:25:50 2012
@@ -1,0 +1,93 @@
+From 884fb8f58d6b1d8a5fd44f563050bf9bd1830402 Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Date: Wed, 24 Aug 2011 12:11:57 +0900
+Subject: Fix typo
+
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+---
+ modules/highgui/src/cap_libv4l.cpp | 2 +-
+ modules/highgui/src/cap_v4l.cpp | 2 +-
+ modules/legacy/src/clique.cpp | 4 ++--
+ modules/legacy/src/lcm.cpp | 2 +-
+ modules/legacy/src/trifocal.cpp | 2 +-
+
+ diff --git a/modules/highgui/src/cap_libv4l.cpp b/modules/highgui/src/cap_libv4l.cpp
+ index 54cc351..8fa99b1 100644
+ --- a/modules/highgui/src/cap_libv4l.cpp
+diff --git a/modules/highgui/src/cap_libv4l.cpp b/modules/highgui/src/cap_libv4l.cpp
+index ce75072..47b6d50 100644
+--- a/modules/highgui/src/cap_libv4l.cpp
++++ b/modules/highgui/src/cap_libv4l.cpp
+@@ -1615,7 +1615,7 @@ static int icvSetControl (CvCaptureCAM_V4L* capture, int property_id, double val
+ }
+
+ if (v4l1_ioctl(capture->deviceHandle, VIDIOCSPICT, &capture->imageProperties) < 0){
+- fprintf(stderr, "HIGHGUI ERROR: V4L: Unable to set video informations\n");
++ fprintf(stderr, "HIGHGUI ERROR: V4L: Unable to set video information\n");
+ icvCloseCAM_V4L(capture);
+ return -1;
+ }
+diff --git a/modules/highgui/src/cap_v4l.cpp b/modules/highgui/src/cap_v4l.cpp
+index cf3ef89..6c426a0 100644
+--- a/modules/highgui/src/cap_v4l.cpp
++++ b/modules/highgui/src/cap_v4l.cpp
+@@ -2682,7 +2682,7 @@ static int icvSetControl (CvCaptureCAM_V4L* capture,
+ < 0)
+ {
+ fprintf(stderr,
+- "HIGHGUI ERROR: V4L: Unable to set video informations\n");
++ "HIGHGUI ERROR: V4L: Unable to set video information\n");
+ icvCloseCAM_V4L(capture);
+ return -1;
+ }
+diff --git a/modules/legacy/src/clique.cpp b/modules/legacy/src/clique.cpp
+index 68a901f..53e6b08 100644
+--- a/modules/legacy/src/clique.cpp
++++ b/modules/legacy/src/clique.cpp
+@@ -343,7 +343,7 @@ int cvFindNextMaximalClique( CvCliqueFinder* finder )
+ break;
+ case NEXT:
+ //here we will look for candidate to translate into not
+- //s[k] now contains index of choosen candidate
++ //s[k] now contains index of chosen candidate
+ {
+ int* new_ = All[k+1];
+ if( nod[k] != 0 )
+@@ -590,7 +590,7 @@ void cvBronKerbosch( CvGraph* graph )
+ break;
+ case NEXT:
+ //here we will look for candidate to translate into not
+- //s[k] now contains index of choosen candidate
++ //s[k] now contains index of chosen candidate
+ {
+ int* new_ = All[k+1];
+ if( nod[k] != 0 )
+diff --git a/modules/legacy/src/lcm.cpp b/modules/legacy/src/lcm.cpp
+index 9c2e952..b880b43 100644
+--- a/modules/legacy/src/lcm.cpp
++++ b/modules/legacy/src/lcm.cpp
+@@ -284,7 +284,7 @@ CV_IMPL CvGraph* cvLinearContorModelFromVoronoiDiagram(CvVoronoiDiagram2D* Voron
+ if( !VoronoiDiagram )
+ CV_ERROR( CV_StsBadArg,"Voronoi Diagram is not defined" );
+ if( maxWidth < 0 )
+- CV_ERROR( CV_StsBadArg,"Treshold parameter must be non negative" );
++ CV_ERROR( CV_StsBadArg,"Threshold parameter must be non negative" );
+
+ for(SiteSet = VoronoiDiagram->sites;
+ SiteSet != NULL;
+diff --git a/modules/legacy/src/trifocal.cpp b/modules/legacy/src/trifocal.cpp
+index 1f361f0..5908b7d 100644
+--- a/modules/legacy/src/trifocal.cpp
++++ b/modules/legacy/src/trifocal.cpp
+@@ -903,7 +903,7 @@ int icvComputeProjectMatricesNPoints( CvMat* points1,CvMat* points2,CvMat* poin
+ tmpProjMatr[1] = cvMat(9,4,CV_64F,tmpProjMatr_dat+36);
+ tmpProjMatr[2] = cvMat(9,4,CV_64F,tmpProjMatr_dat+72);
+
+- /* choosen points */
++ /* chosen points */
+
+ while( wasCount < NumSamples )
+ {
+--
+1.7.5.4
+
Added: packages/opencv/tags/2.3.1-12/debian/0011_optimize_i486.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/0011_optimize_i486.patch?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/0011_optimize_i486.patch (added)
+++ packages/opencv/tags/2.3.1-12/debian/0011_optimize_i486.patch Mon Aug 27 22:25:50 2012
@@ -1,0 +1,26 @@
+From 629055acc3d2070c051aa8bd7b85f59c13b4d879 Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Date: Wed, 24 Aug 2011 12:13:20 +0900
+Subject: Optimize of i386 changed from 686 to 486.
+
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+---
+ 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
+
Added: packages/opencv/tags/2.3.1-12/debian/0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch (added)
+++ packages/opencv/tags/2.3.1-12/debian/0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch Mon Aug 27 22:25:50 2012
@@ -1,0 +1,125 @@
+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 <sys/sysctl.h>
+ #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();
Added: packages/opencv/tags/2.3.1-12/debian/0013_drop_asm_types_h_kfreebsd.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/0013_drop_asm_types_h_kfreebsd.patch?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/0013_drop_asm_types_h_kfreebsd.patch (added)
+++ packages/opencv/tags/2.3.1-12/debian/0013_drop_asm_types_h_kfreebsd.patch Mon Aug 27 22:25:50 2012
@@ -1,0 +1,24 @@
+--- a/modules/highgui/src/cap_libv4l.cpp 2011-12-21 16:53:15.000000000 +0900
++++ b/modules/highgui/src/cap_libv4l.cpp 2011-12-21 16:54:16.000000000 +0900
+@@ -236,7 +236,9 @@
+ #include <sys/mman.h>
+ #include <string.h>
+ #include <stdlib.h>
++#if defined(__linux__)
+ #include <asm/types.h> /* for videodev2.h */
++#endif
+ #include <assert.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+--- a/modules/highgui/src/cap_v4l.cpp 2011-12-21 16:53:06.000000000 +0900
++++ b/modules/highgui/src/cap_v4l.cpp 2011-12-21 16:53:38.000000000 +0900
+@@ -218,7 +218,9 @@
+
+ #include <string.h>
+ #include <stdlib.h>
++#if defined(__linux__)
+ #include <asm/types.h> /* for videodev2.h */
++#endif
+ #include <assert.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
Added: packages/opencv/tags/2.3.1-12/debian/0014_fix_ftbfs_libav0.8.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/0014_fix_ftbfs_libav0.8.patch?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/0014_fix_ftbfs_libav0.8.patch (added)
+++ packages/opencv/tags/2.3.1-12/debian/0014_fix_ftbfs_libav0.8.patch Mon Aug 27 22:25:50 2012
@@ -1,0 +1,18 @@
+Description: FTBFS with libav 0.8
+Forwarded: not yet
+Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+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 <libswscale/swscale.h>
+ #endif
++#include <libavutil/mathematics.h>
+
+ #endif
+
Added: packages/opencv/tags/2.3.1-12/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/changelog?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/changelog (added)
+++ packages/opencv/tags/2.3.1-12/debian/changelog Mon Aug 27 22:25:50 2012
@@ -1,0 +1,727 @@
+opencv (2.3.1-12) unstable; urgency=low
+
+ * Switch to multiarch.
+ - Add patches/switch_multiarch.patch.
+ - Update *.install files.
+ - Add Pre-Depends to multiarch support packages.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Thu, 09 Aug 2012 09:41:39 +0900
+
+opencv (2.3.1-11) unstable; urgency=high
+
+ * Update debian/control.
+ - Bumped Standards-Version to 3.9.3. No changes needed.
+ - Update Homepage field.
+ - Add python-numpy-abi9 and python-numpy (>= 1:1.6.1) to python-opencv.
+ Fix lintian error for missing-dependency-on-numpy-abi. (Closes: #676633)
+ * Update debian/rules.
+ - Remove unnecessary option of build config.
+ * Add lintian-overrides files for hardening-no-fortify-functions.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Thu, 28 Jun 2012 04:04:04 +0900
+
+opencv (2.3.1-10) unstable; urgency=high
+
+ * Update debian/control.
+ - Add Replaces and Breaks of libopencv-core-dev to libopencv-dev.
+ (Closes: #674242)
+ - Cleanup Depends of packages.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Tue, 29 May 2012 08:43:39 +0900
+
+opencv (2.3.1-9) unstable; urgency=low
+
+ * Update debian/control.
+ - pkg-config and binarys move from libopencv-core-dev to libopencv-dev.
+ (Closes: #671376, #658197)
+ - Drop Replaces and Breaks from libopencv-core-dev. (Closes: #668708)
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Tue, 22 May 2012 12:17:09 +0900
+
+opencv (2.3.1-8) unstable; urgency=low
+
+ * Add support TBB.
+ * Fix getting value of dpkg-architecture.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Thu, 02 Feb 2012 12:40:01 +0900
+
+opencv (2.3.1-7) unstable; urgency=low
+
+ * Update debian/libopencv-core-dev.install.
+ - Change install path of OpenCVConfig.cmake from usr/share/opencv/
+ to usr/share/OpenCV. (Closes: #658196)
+ - usr/share/OpenCV/OpenCVConfig-version.cmake was added to the
+ installation file of libopencv-core-dev.
+ * Add debian/*-dev.docs.
+ This provides README.Debian with *-dev packages.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Thu, 02 Feb 2012 02:39:05 +0900
+
+opencv (2.3.1-6) unstable; urgency=low
+
+ * Fix installation of usr/include/opencv2/opencv.hpp. (Closes: #656860)
+ Update debian/libopencv-core-dev.install.
+ * Remove old build flags and add optimize flag for amd64.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Tue, 31 Jan 2012 08:08:00 +0900
+
+opencv (2.3.1-5) unstable; urgency=low
+
+ * Fix FTBFS with libav 0.8. (Closes: #654220)
+ Add patches/0014_fix_ftbfs_libav0.8.patch.
+ * Update debian/control.
+ Add python-sphinx to Build-Depends.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Fri, 27 Jan 2012 05:36:29 +0900
+
+opencv (2.3.1-4) unstable; urgency=low
+
+ * Update patches/0013_drop_asm_types_h_kfreebsd.patch.
+ Drop <asm/types.h>, not <sys/types.h>.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Wed, 21 Dec 2011 17:01:12 +0900
+
+opencv (2.3.1-3) unstable; urgency=low
+
+ * Update debian/README.Debian.
+ * Update debian/control.
+ - Update Depends package for libopencv-dev.
+ * Fix build on kfreeBSD. (Closes: #651872)
+ Update patches/0013_drop_asm_types_h_kfreebsd.patch.
+ Thanks to Julien Cristau.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Wed, 21 Dec 2011 12:02:10 +0900
+
+opencv (2.3.1-2) unstable; urgency=low
+
+ * Update debian/control.
+ - Adjusted version for Replaces and Breaks of libopencv-core-dev.
+ (Closes: #651988). Thanks to Ansgar Burchardt.
+ * Fix build on kfreeBSD. (Closes: #651872)
+ Add patches/0013_drop_asm_types_h_kfreebsd.patch.
+ Thanks to Julien Cristau.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Tue, 20 Dec 2011 17:10:11 +0900
+
+opencv (2.3.1-1) unstable; urgency=low
+
+ * Upload to unstable.
+ * Update debian/control.
+ Switch Build-Depends from libong62-dev to libpng-dev.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Mon, 12 Dec 2011 12:06:57 +0900
+
+opencv (2.3.1-0exp1) experimental; urgency=low
+
+ * New upstream release.
+ * Update debian/control.
+ - Fix uses hardcoded list of non-Linux architectures in debian/control.
+ (Closes: #634365)
+ * Add lintian overrides files.
+ * Update install files.
+ * Update and remove some patches.
+ - Update patches/0005-build-static-libs.patch.
+ - Update patches/0007-typos-in-strings-docs.patch.
+ - Update patches/0011_optimize_i486.patch.
+ - Remove patches/0001-fix_3rdparty_build.patch.
+ - Remove patches/0006-typos-in-license.patch.
+ - Remove patches/0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Thu, 25 Aug 2011 12:04:49 +0900
+
+opencv (2.3.0-0exp4) experimental; urgency=low
+
+ * Fix FTBFS with libav 0.7. (Closes: #634818)
+ Add patches/vcap_ffmpeg_fix_compile_against_libav0.7.patch.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Wed, 27 Jul 2011 01:51:25 +0900
+
+opencv (2.3.0-0exp3) experimental; urgency=low
+
+ * Add libopencv-dev package.
+ This is a meta package providing development package necessary for
+ development of OpenCV (Open Computer Vision).
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Fri, 15 Jul 2011 02:46:05 +0900
+
+opencv (2.3.0-0exp2) experimental; urgency=low
+
+ * Update debian/control
+ - Switch Build-Depends from libjpeg62-dev to libjpeg-dev for libjpeg8
+ transition.
+ - Add zlib1g-dev Build-Depends of libopencv-core-dev.
+ - Add some development package to Build-Depends of libopencv-highgui-dev.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Tue, 12 Jul 2011 08:54:37 +0900
+
+opencv (2.3.0-0exp1) experimental; urgency=low
+
+ * New upstream release.
+ - Update install files.
+ - Update some patches for 2.3.
+ patches/0005-build-static-libs.patch
+ patches/0001-fix_3rdparty_build.patch
+ patches/0011_optimize_i486.patch
+ - Remove some patches revised in upstream.
+ patches/0002-fix_build_pdf.patch patches/0003-hurd.patch
+ patches/0004-fix_stdint_gcc45.patch patches/0009_support_v4lv2_only.patch
+ patches/0008_fix_ftbfs_with_gcc-4.6.patch patches/0010_fix_ftbs_png15.patch
+ * Update debian/control.
+ - Update depends of packages.
+ * Update debian/rules.
+ - Update path of hdr_parser.pyc from modules/python to
+ modules/python/src2.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Wed, 06 Jul 2011 09:47:09 +0900
+
+opencv (2.2.0-0exp2) experimental; urgency=low
+
+ * Add libopencv-contrib-dev to Depends of libcvaux-dev (Closes: #632439).
+ Thanks to Mark Purcell.
+ * Arranged the dependence.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Tue, 05 Jul 2011 13:30:06 +0900
+
+opencv (2.2.0-0exp1) experimental; urgency=low
+
+ * New upstream release. (Closes: #623532, #563428, #604642)
+ - Update, refresh and prune debian/patches.
+ - Account for upstream splitting/renaming libs:
+ + generate N dynamic library packages.
+ + name all library package as libopencv-*.
+ - Update debian/copyright.
+ - Remove debian/README.source.
+ - Update debian/*.install scripts.
+ - Update lintian overrides.
+ - Add libv4l-dev to Build-Depends.
+ * Bump to dh 8.
+ * Switch to source format 3.0 (quilt).
+ * Patch minor upstream typos.
+ * Fix formatting in debian/man/opencv_traincascade.1.
+ * Bumped standards-version to 3.9.2. No changes needed.
+ * Update debian repository pointers for new alioth hosts.
+ * Add support openexr.
+ * Move usr/share/opencv/haarcascades and usr/share/opencv/lbpcascades
+ to libopencv-core-dev (Closes: #598356).
+ * Fix build using gcc-4.6 (Closes: #624917).
+ - Add patches/0008_fix_ftbfs_with_gcc-4.6.patch.
+ * Fix build without v4l1 (Closes: #623418).
+ - Add patches/0009_support_v4lv2_only.patch.
+ * Fix build with libpng15.
+ - Add patch/0010_fix_ftbs_png15.patch.
+ * Fix optimize of i386 (Closes: 629414).
+ - Opencv was optimized to i686. This chenged optimization to i486.
+ - Add patch/0011_optimize_i486.patch.
+ * If build architecture is amd64, enable SSE2 option.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Mon, 27 Jun 2011 11:51:39 +0900
+
+opencv (2.1.0-4) unstable; urgency=low
+
+ * Fix install path of opencv-doc (Closes: #610803).
+ * Fix FTBFS on gcc-4.5(Closes: #607086, #618045).
+ - Add patches/fix_stdint_gcc45.patch
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Wed, 16 Mar 2011 01:55:22 +0900
+
+opencv (2.1.0-3) unstable; urgency=low
+
+ * Fix set opencv minor version on Python (Closes: #600836).
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Tue, 02 Nov 2010 19:55:47 +0900
+
+opencv (2.1.0-2) unstable; urgency=low
+
+ * Update debian/control.
+ - Bumped standards-version to 3.9.1. No changes needed.
+ - Add python-numpy to Build-depends (Closes: #593310)
+ * Add hurd support patch (Closes: #589586).
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Wed, 25 Aug 2010 01:49:14 +0900
+
+opencv (2.1.0-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #577594, #587232, #563717)
+ * Update debian/rules.
+ - Update build-system to debhelper v7.
+ * Update debian/control.
+ - Bumped standards-version to 3.9.0. No changes needed.
+ - library package name update.
+ Soname of opencv library changed from 4 to 2.1.
+ - Add cmake, liblapack-dev, texlive-fonts-extra, texlive-latex-extra,
+ texlive-latex-recommended, latex-xcolor and texlive-fonts-recommended
+ to Build-depends.
+ - Add arch depends to libraw1394-dev and libdc1394-22-dev.
+ Thanks to Pino Toscano. (Closes: #581210)
+ * Add opencv-doc.lintian-overrides.
+ opencv-doc has some sample program of python.
+ * Update man files.
+ * Update patches
+ - Update and rename 500_remove_bashism.patch.
+ And rename to remove_bashism.patch.
+ * Add new patches.
+ - Enable build static library.
+ enable_static.patch
+ - Disable build 3rd party library.
+ Use zlib and lapack in debian package.
+ fix_3rdparty_build.patch
+ - Fix build pdf.
+ fix_build_pdf.patch
+ - Remove cvconfig.h
+ remove_cvconfig.h.patch
+ * Remove some patches.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Fri, 16 Jul 2010 13:12:28 +0900
+
+opencv (2.0.0-4) unstable; urgency=low
+
+ * Update debian/control.
+ - Bumped standards-version to 3.8.4. No changes needed.
+ * Change install path of python-opencv. (Closes: #565121)
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Sun, 14 Mar 2010 13:19:00 +0900
+
+opencv (2.0.0-3) unstable; urgency=low
+
+ * Remove libcv1, libhighgui1 and libcvaux1 from Conflicts and Replaces.
+ (Closes: #560283)
+ * Remove cvconfig.h from libcv-dev package. (Closes: #559857)
+ Update libcv-dev.install and backport r2242 of commit from upstream.
+ Thanks to Filippo Giunchedi.
+ debian/patches/110_backport_r2242.diff
+ * Fix FTBFS with GCC 4.4. (Closes: #562742)
+ Backport r2255 of commit from upstream. Thanks to Filippo Giunchedi.
+ debian/patches/110_backport_r2255.diff
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Thu, 07 Jan 2010 20:48:47 +0900
+
+opencv (2.0.0-2) unstable; urgency=low
+
+ * Add cvconfig.h to libcv-dev. (Closes: #559857)
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Tue, 08 Dec 2009 10:00:14 +0900
+
+opencv (2.0.0-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #507588, #549997, #492445)
+ * Update Standards-Version to 3.8.3
+ * Add debian/README.source
+ * Add libdc1394-22-dev to Build-Depends. (Closes: #507584, #516794)
+ * Remove libcvaux-dev and libhighgui-dev from Depends of libcv-dev.
+ (Closes: #525023)
+ * Remove all .la files.
+ * Update debian/watch file. (Closes: #557140)
+ * Update debian/rules file.
+ Add --disable-sse and --disable-optimization to configure.
+ * Remove bashism. (Closes: #530153)
+ 500_remove_bashism.patch
+ * Update debian/patches
+ 010_m4_syntax.diff
+ 010_fix_optimisations.diff
+ 010_makefile_syntax.diff
+ 010_python_cspec.diff
+ 020_python_linking.diff
+ 100_static_inline.diff
+ 100_amd64.diff
+ 120_header_warnings.diff
+ * Remove debian/patches
+ - Merge to upstream
+ 030_install_hook.diff
+ 100_ffmpeg_updates.diff
+ 210_openmp_compilation.diff
+ 300_fix_segfault_in_window_gtk.diff
+ 400_ffmpeg_splitting_autofoo.diff
+ 410_ffmpeg_use_swscale.diff
+ 420_typedef_longint.diff
+ 430_highgui_jpeg_camera.diff
+ - Don't need new version
+ 010_ffmpeg_linking.diff
+ 050_rebootstrap.diff
+ 200_documentation.diff
+ 500_ftbfs_gcc44.diff
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org> Tue, 01 Dec 2009 01:13:18 +0900
+
+opencv (1.0.0-6.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Rebuild against new libraw1394 (Closes: #516646, #516920)
+ * Add libhighgui-dev dependency on libswscale-dev thanks Giel van Schijndel
+ (Closes: #547729)
+ * debian/patches/420_typedef_longint.diff: define int64/uint64 as int64_t
+ and uint64_t respectively, patch pulled from upstream r2163
+ (Closes: #543546)
+ * debian/patches/410_ffmpeg_use_swscale.diff: move
+ #define __STDC_CONSTANT_MACROS before #include <stdint.h> into
+ debian/patches/420_typedef_longint.diff
+ * debian/patches/500_ftbfs_gcc44.diff: fix FTBFS with gcc-4.4
+ thanks to Martin Michlmayr (Closes: #504831)
+ * debian/patches/430_highgui_jpeg_camera.diff: recognize JPEG cameras
+ (Closes: #536041)
+
+ -- Filippo Giunchedi <filippo at debian.org> Sat, 14 Nov 2009 17:04:41 +0100
+
+opencv (1.0.0-6.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Port to newer ffmpeg. Closes: #487638, #490700, #493915
+ Loosely based on patch Gijs Molenaar, thanks.
+
+ -- Thomas Viehmann <tv at beamnet.de> Thu, 09 Jul 2009 21:43:02 +0200
+
+opencv (1.0.0-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control:
+ + Dropped build dependency on libdc1394-22-dev (Closes: #497689)
+ + Added ${misc:Depends} where missing
+
+ -- Raphael Geissert <atomo64 at gmail.com> Thu, 11 Sep 2008 14:36:06 -0500
+
+opencv (1.0.0-6) unstable; urgency=low
+
+ * debian/patches/120_header_warnings.diff:
+ + Fix more warnings in shipped headers.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 28 Aug 2008 22:53:43 +0000
+
+opencv (1.0.0-5) unstable; urgency=high
+
+ [ Daniel Leidert ]
+
+ * debian/control: Added Homepage field.
+ (Vcs-Svn): Fixed.
+ (Depends, Build-Depends): Added libjasper-dev (closes: #428474).
+ * debian/dirs: Removed (useless). Avoids empty directories.
+ * debian/libcv-dev.install: Small cosmetic fix.
+ * debian/libcv-dev.manpages: Added for haartraining utilities.
+ * debian/opencv-createsamples.1: Initially added.
+ * debian/opencv-haartraining.1: Ditto.
+ * debian/opencv-performance.1: Ditto.
+ * debian/opencv-doc.install: Install Makefile.debian here.
+ * debian/rules (install, binary-arch, binary-indep): Removed most of the
+ unused debhelper calls. Let dh_install exclude files we don't want. Don't
+ install examples twice. Removed installation of opencv-config.1 (closes:
+ #407946).
+ * debian/watch: Added.
+ * debian/patches/300_fix_segfault_in_window_gtk.diff: Added. Merged from
+ Ubuntu.
+ * debian/patches/series: Adjusted.
+
+ [ Sam Hocevar ]
+
+ * High urgency to ease testing propagations.
+ * debian/patches/100_ffmpeg_updates.diff:
+ + Updated patch to latest ffmpeg version (Closes: #482217).
+ * debian/patches/020_python_linking.diff:
+ + Link python bindings with required libraries.
+ * debian/patches/030_install_hook.diff:
+ + Use install-exec-hook instead of install-hook.
+
+ * debian/control:
+ + Build-depend on more recent libavcodec-dev.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 08 Jun 2008 15:01:18 +0000
+
+opencv (1.0.0-4) unstable; urgency=low
+
+ * debian/rules:
+ + Support CONCURRENCY_LEVEL.
+ + Don't ignore make distclean errors.
+
+ * debian/control:
+ + Add ${shlibs:Depends} to -dev packages, to get a proper dependency
+ when these packages ship binaries.
+ + Use ${binary:Version} instead of ${Source-Version} (Closes: 430726).
+ + Set policy to 3.7.3.
+ + Use Vcs-Svn: instead of XS-Vcs-Svn: fields.
+
+ * debian/patches/100_ffmpeg_updates.diff:
+ + Updated patch. Getting and setting framerate in FFmpeg streams now
+ works properly again. Thanks to Eric Beets for half the fix.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 10 Mar 2008 16:41:56 +0000
+
+opencv (1.0.0-3) unstable; urgency=low
+
+ * debian/control:
+ + Set maintainer to the pkg-scicomp team.
+ + Updated Vcs fields.
+ * debian/compat:
+ + Set compat version to 5.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 1 Apr 2007 15:19:15 +0200
+
+opencv (1.0.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/patches/120_header_warnings.diff:
+ + New patch. Fix warnings in shipped headers.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 28 Mar 2007 19:02:18 +0200
+
+opencv (1.0.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ + Depend on pkg-config now that opencv-config is deprecated.
+ * debian/rules:
+ + Do not remove haartraining files (Closes: #368568).
+
+ * debian/patches/010_python_cspec.diff:
+ + New patch. Add -fno-strict-aliasing because of numerous aliasing
+ issues in the code (Closes: #388129).
+
+ * debian/patches/110_dc1394.diff:
+ + Fix a few bugs in the dc1394 code.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 14 Nov 2006 17:12:26 +0100
+
+opencv (0.9.7-4) unstable; urgency=low
+
+ * Migrate package to the new python policy (Closes: #373469), thanks to
+ Pierre Habouzit.
+ * debian/control: add XS-Vcs-Svn information.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 12 Oct 2006 09:21:14 +0200
+
+opencv (0.9.7-3) unstable; urgency=low
+
+ * debian/patches/110_dereferencement.diff:
+ + Fix compilation warnings due to type-punned pointer dereferencement.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 12 Jun 2006 12:14:44 +0200
+
+opencv (0.9.7-2) unstable; urgency=low
+
+ * Switched patch system from dpatch to quilt.
+ * debian/control:
+ + Set policy to 3.7.2.
+ + Build-depend on newer versions of libavcodec-dev so that we can get
+ dynamically linked with it.
+ + Build-depend on quilt instead of dpatch.
+
+ * debian/patches/010_enable_static.diff:
+ + Old patch -- enable static libraries.
+
+ * debian/patches/010_ffmpeg_linking.diff:
+ + Old patch -- correct ffmpeg linking.
+
+ * debian/patches/010_fix_optimisations.diff:
+ + Old patch -- fix optimisation flags for GCC bug workarounds.
+
+ * debian/patches/010_m4_syntax.diff:
+ + Old patch -- fix m4 syntax.
+
+ * debian/patches/010_makefile_syntax.diff:
+ + Old patch -- fix Makefile.am syntax.
+
+ * debian/patches/010_proper_sonames.diff:
+ + Old patch -- fix library sonames.
+
+ * debian/patches/020_rebootstrap.diff:
+ + Old patch -- rebootstrap package.
+
+ * debian/patches/100_amd64.diff:
+ + Fix inclusion of <emmintrin.h> on AMD64 (Closes: #365752, #366105).
+
+ * debian/patches/100_ffmpeg_updates.diff:
+ + Old patch -- update ffmpeg code to get in sync with newer API.
+
+ * debian/patches/100_python_files.diff:
+ + Old patch -- remove shebang from non-executable python files.
+
+ * debian/patches/100_static_inline.diff:
+ + Old patch -- replace inline with static inline in public headers.
+
+ * debian/patches/200_documentation.diff:
+ + Old patch -- get documentation in sync with the API.
+
+ * debian/patches/200_examples_makefile.diff:
+ + Old patch -- add a Makefile to the examples directory.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 14 May 2006 05:40:42 +0200
+
+opencv (0.9.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Maintainer upload.
+ * Acknowledging previous NMU (Closes: #339240). Thanks to Steve Langasek.
+ * debian/control:
+ + Build-depend on swig because of the Python bindings.
+ + Renamed 0.9-0c2 packages to 0.9.7-0 due to API changes.
+ + Depend and build-depend on libavformat-dev.
+ * debian/rules:
+ + Activated Python wrappers.
+ + Build example apps.
+ * cxtypes.h highgui.h: Replace "static" with "static inline" for inline
+ functions declared in the public headers.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 19 Apr 2006 09:37:55 +0200
+
+opencv (0.9.6-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Medium-urgency upload for RC bugfix.
+ * Rename libcvaux0.9-0c2 to libcvaux0.9-0c2a for the C++ mt allocator ABI
+ transition, and conflict/replace libcvaux0.9-0c2 accordingly
+ (closes: #339240).
+
+ -- Steve Langasek <vorlon at debian.org> Sat, 3 Dec 2005 21:27:40 -0800
+
+opencv (0.9.6-4) unstable; urgency=low
+
+ * tests/cv/src/asobel.cpp:
+ + Fixed an illegal int/void* cast.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 26 Sep 2005 19:39:52 +0200
+
+opencv (0.9.6-3) unstable; urgency=low
+
+ * debian/control:
+ + Build-depend on a newer libavcodec-dev.
+ + Make libhighgui-dev depend on all required -dev packages such as
+ libtheora-dev (Closes: #319018).
+ * debian/rules:
+ + Hint --build and --host to configure.
+ * configure.in:
+ + Use -O2 on m68k instead of -O3 to bypass gcc ICEs (Closes: #321106).
+ * tests/cv/src/apyramids.cpp: fixed 64 bits compilation (Closes: #318791).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 16 Sep 2005 11:53:13 +0200
+
+opencv (0.9.6-2) unstable; urgency=low
+
+ * The great g++ transition upload.
+ * debian/control:
+ + Renamed 0.9-0 packages to 0.9-0c2.
+ + Set policy to 3.6.2.1.
+ + Build-depend on a newer libavcodec-dev.
+ * docs/index.htm:
+ + Encoded invalid HTML characters.
+ + Fixed links to the reference manual (Closes: #306922).
+ * docs/ref/opencvref_cv.htm:
+ + Encoded invalid HTML characters.
+ + Fixed the definition of CvHistogram (Closes: #307269).
+ * otherlibs/highgui/cvcap.cpp:
+ + Hardcoded the capture framerate because ffmpeg no longer easily provides
+ the information.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 14 Jul 2005 15:48:31 +0200
+
+opencv (0.9.6-1) unstable; urgency=low
+
+ * New upstream release (Closes: #267825).
+ * Major upstream changes:
+ + This release merged most Debian-specific patches upstream.
+ + This version now uses pkg-config instead of opencv-config.
+ + This version uses GTK+ instead of Motif widgets.
+ + Example programs were fixed (Closes: #254150).
+ * debian/control:
+ + Build-depend on libdc1394 and libavcodec. As a result, build no longer
+ fails if libavcodec-dev is installed (Closes: #270345).
+ * debian/copyright:
+ + Fixed upstream URL (Closes: #270344).
+ * cvaux/src/cvvideo.cpp: the code portion causing an FTBFS on amd64 is no
+ longer there (Closes: #297625).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 1 Apr 2005 19:30:58 +0200
+
+opencv (0.9.5-10) unstable; urgency=high
+
+ * debian/patches/30_delete.dpatch:
+ + Fixed a crash at program exit (Closes: #269799).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 3 Sep 2004 21:59:26 +0200
+
+opencv (0.9.5-9) unstable; urgency=high
+
+ * debian/control:
+ + Build-depend on lesstif2-dev to take advantage of new Motif 2 features.
+ + libhighgui-dev depends on lesstif2-dev as well.
+ * debian/patches/20_old.dpatch:
+ + No longer patch/unpatch the Makefiles to avoid clock skew issues
+ (Closes: #266622).
+ * debian/patches/30_delete.dpatch:
+ + Fixed delete[] / delete mismatches.
+ * debian/patches/30_window_lnx.cpp.setTrackbarPos_crash.dpatch:
+ + Fix a crash in cvSetTrackbarPos() for closed windows, courtesy of
+ micha137 at users.sourceforge.net.
+ * debian/patches/40_linux_trackbar.dpatch
+ debian/patches/30_linux_mouse.dpatch:
+ + Add arrows to trackbars, courtesy of Filip Sadlo.
+ + Fixed position of mouse button events, courtesy of Filip Sadlo.
+ * debian/patches/30_render.dpatch:
+ + Fixed pointer casts, courtesy of buddha_pht at users.sourceforge.net.
+ * debian/patches/30_xshm.dpatch:
+ + Don't use XShm over network connections.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 17 Aug 2004 18:01:23 +0200
+
+opencv (0.9.5-8) unstable; urgency=low
+
+ * debian/control:
+ + Added missing build dependency on dpatch (Closes: #262209).
+ * debian/rules:
+ + Call unpatch before make clean.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 30 Jul 2004 08:34:59 +0200
+
+opencv (0.9.5-7) unstable; urgency=low
+
+ * Rebuilt against libtiff4 due to an ABI change.
+ * Fixed numerous compilation warning due to pointer/int size assumptions and
+ char signedness assumption.
+ * debian/control:
+ + Set policy to 3.6.1.1.
+ + Switched packaging method to dpatch.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 25 Jul 2004 21:54:33 +0200
+
+opencv (0.9.5-6) unstable; urgency=low
+
+ * cv/include/cvcompat.h cv/include/cvtypes.h:
+ + Fixed more C preprocessor warnings.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 30 Jun 2004 14:04:12 +0200
+
+opencv (0.9.5-5) unstable; urgency=low
+
+ * cv/include/cv.h:
+ + Fixed C preprocessor warnings.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 30 Jun 2004 11:59:36 +0200
+
+opencv (0.9.5-4) unstable; urgency=low
+
+ * debian/control:
+ + Added missing lesstif-dev build dependency to the libhighgui-dev
+ package (Closes: #252304).
+ * debian/README.Debian:
+ + Minor updates.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 2 Jun 2004 13:27:07 -0300
+
+opencv (0.9.5-3) unstable; urgency=low
+
+ * debian/rules:
+ + Enabled static libraries in the build (Closes: #249471).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 19 May 2004 21:48:47 +0200
+
+opencv (0.9.5-2) unstable; urgency=low
+
+ * debian/control:
+ + Added libxaw7-dev to the build dependencies.
+ + Added libxaw7-dev to the libcvcam-dev dependencies.
+ * debian/copyright:
+ + Removed a duplicate copyright entry.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 28 Apr 2004 10:25:56 +0200
+
+opencv (0.9.5-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 22 Apr 2004 14:55:19 +0200
+
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-calib3d2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-calib3d2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-calib3d2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-calib3d2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-calib3d2.3: hardening-no-fortify-functions usr/lib/libopencv_calib3d.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-contrib2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-contrib2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-contrib2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-contrib2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-contrib2.3: hardening-no-fortify-functions usr/lib/libopencv_contrib.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-core2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-core2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-core2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-core2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-core2.3: hardening-no-fortify-functions usr/lib/libopencv_core.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-dev.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-dev.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-dev.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-dev.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,12 @@
+libopencv-dev: hardening-no-relro usr/bin/opencv_createsamples
+libopencv-dev: hardening-no-fortify-functions usr/bin/opencv_createsamples
+libopencv-dev: hardening-no-relro usr/bin/opencv_haartraining
+libopencv-dev: hardening-no-fortify-functions usr/bin/opencv_haartraining
+libopencv-dev: hardening-no-relro usr/bin/opencv_performance
+libopencv-dev: hardening-no-fortify-functions usr/bin/opencv_performance
+libopencv-dev: hardening-no-relro usr/bin/opencv_stitching
+libopencv-dev: hardening-no-fortify-functions usr/bin/opencv_stitching
+libopencv-dev: hardening-no-relro usr/bin/opencv_traincascade
+libopencv-dev: hardening-no-fortify-functions usr/bin/opencv_traincascade
+libopencv-dev: binary-without-manpage usr/bin/opencv_stitching
+
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-features2d2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-features2d2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-features2d2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-features2d2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-features2d2.3: hardening-no-fortify-functions usr/lib/libopencv_features2d.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-flann2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-flann2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-flann2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-flann2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-flann2.3: hardening-no-fortify-functions usr/lib/libopencv_flann.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-gpu2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-gpu2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-gpu2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-gpu2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-gpu2.3: hardening-no-fortify-functions usr/lib/libopencv_gpu.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-highgui2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-highgui2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-highgui2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-highgui2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-highgui2.3: hardening-no-fortify-functions usr/lib/libopencv_highgui.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-imgproc2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-imgproc2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-imgproc2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-imgproc2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-imgproc2.3: hardening-no-fortify-functions usr/lib/libopencv_imgproc.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-legacy2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-legacy2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-legacy2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-legacy2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-legacy2.3: hardening-no-fortify-functions usr/lib/libopencv_legacy.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-ml2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-ml2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-ml2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-ml2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-ml2.3: hardening-no-fortify-functions usr/lib/libopencv_ml.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-objdetect2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-objdetect2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-objdetect2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-objdetect2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-objdetect2.3: hardening-no-fortify-functions usr/lib/libopencv_objdetect.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/libopencv-video2.3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/libopencv-video2.3.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/libopencv-video2.3.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/libopencv-video2.3.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+libopencv-video2.3: hardening-no-fortify-functions usr/lib/libopencv_video.so.2.3.1
Added: packages/opencv/tags/2.3.1-12/debian/python-opencv.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/python-opencv.lintian-overrides?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/python-opencv.lintian-overrides (added)
+++ packages/opencv/tags/2.3.1-12/debian/python-opencv.lintian-overrides Mon Aug 27 22:25:50 2012
@@ -1,0 +1,1 @@
+python-opencv: hardening-no-fortify-functions usr/lib/pyshared/python2.7/cv2.so
Added: packages/opencv/tags/2.3.1-12/debian/series
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/series?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/series (added)
+++ packages/opencv/tags/2.3.1-12/debian/series Mon Aug 27 22:25:50 2012
@@ -1,0 +1,7 @@
+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
+switch_multiarch.patch
Added: packages/opencv/tags/2.3.1-12/debian/switch_multiarch.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/switch_multiarch.patch?rev=45338&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/switch_multiarch.patch (added)
+++ packages/opencv/tags/2.3.1-12/debian/switch_multiarch.patch Mon Aug 27 22:25:50 2012
@@ -1,0 +1,30 @@
+Description: set CMAKE_LIBRARY_ARCHITECTURE and switch to multiarch support.
+Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Last-Update: 2012-08-08
+Forwarded: no
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,7 +131,7 @@ endif()
+ if(ANDROID)
+ set(OPENCV_LIB_INSTALL_PATH libs/${ARMEABI_NDK_NAME})
+ else()
+- set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX})
++ set(OPENCV_LIB_INSTALL_PATH lib/${CMAKE_LIBRARY_ARCHITECTURE})
+ endif()
+
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}")
+--- a/OpenCVModule.cmake
++++ b/OpenCVModule.cmake
+@@ -111,6 +111,11 @@ macro(define_opencv_module name)
+ RUNTIME DESTINATION bin COMPONENT main
+ LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
+ ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
++
++ install(TARGETS ${the_target_s}
++ RUNTIME DESTINATION bin COMPONENT main
++ LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
++ ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/${name}
More information about the debian-science-commits
mailing list