tags 516646 + patch
tags 516920 + patch
tags 547729 + patch
thanks
Dear maintainer,
I've prepared an NMU for opencv (versioned as 1.0.0-6.3) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
filippo
--
Filippo Giunchedi - http://esaurito.net - 0x6B79D401
If there is any better use for being famous and respected than using
that status to question orthodoxy, I haven't found it yet.
-- Eric S. Raymond
diff -u opencv-1.0.0/debian/changelog opencv-1.0.0/debian/changelog
--- opencv-1.0.0/debian/changelog
+++ opencv-1.0.0/debian/changelog
@@ -1,3 +1,22 @@
+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 <fili...@debian.org> Sat, 14 Nov 2009 17:04:41 +0100
+
opencv (1.0.0-6.2) unstable; urgency=low
* Non-maintainer upload.
diff -u opencv-1.0.0/debian/control opencv-1.0.0/debian/control
--- opencv-1.0.0/debian/control
+++ opencv-1.0.0/debian/control
@@ -71,7 +71,7 @@
Package: libhighgui-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, libhighgui1 (= ${binary:Version}), libcv-dev (>= ${binary:Version}), libpng12-dev, libjpeg-dev, zlib1g-dev, libtiff4-dev, libgtk2.0-dev, libavcodec-dev (>= 0.cvs20050918-2), libavformat-dev, libjasper-dev, pkg-config, ${misc:Depends}
+Depends: ${shlibs:Depends}, libhighgui1 (= ${binary:Version}), libcv-dev (>= ${binary:Version}), libpng12-dev, libjpeg-dev, zlib1g-dev, libtiff4-dev, libgtk2.0-dev, libavcodec-dev (>= 0.cvs20050918-2), libavformat-dev, libswscale-dev, libjasper-dev, pkg-config, ${misc:Depends}
Description: development files for libhighgui
This package contains the header files and static library needed to compile
applications that use the OpenCV (Open Computer Vision) GUI.
diff -u opencv-1.0.0/debian/patches/series opencv-1.0.0/debian/patches/series
--- opencv-1.0.0/debian/patches/series
+++ opencv-1.0.0/debian/patches/series
@@ -20,0 +21,3 @@
+420_typedef_longint.diff
+430_highgui_jpeg_camera.diff
+500_ftbfs_gcc44.diff
diff -u opencv-1.0.0/debian/patches/410_ffmpeg_use_swscale.diff opencv-1.0.0/debian/patches/410_ffmpeg_use_swscale.diff
--- opencv-1.0.0/debian/patches/410_ffmpeg_use_swscale.diff
+++ opencv-1.0.0/debian/patches/410_ffmpeg_use_swscale.diff
@@ -1,21 +1,19 @@
Index: opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp
===================================================================
---- opencv-1.0.0.orig/otherlibs/highgui/cvcap_ffmpeg.cpp 2009-07-09 21:44:29.000000000 +0200
-+++ opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp 2009-07-09 22:36:52.000000000 +0200
-@@ -43,7 +43,11 @@
+--- opencv-1.0.0.orig/otherlibs/highgui/cvcap_ffmpeg.cpp 2009-11-13 16:00:46.000000000 +0100
++++ opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp 2009-11-13 16:13:24.000000000 +0100
+@@ -43,7 +43,9 @@
extern "C" {
-#include <ffmpeg/avformat.h>
-+#define __STDC_CONSTANT_MACROS // avformat needs INT64_C fro stdint which needs this
-+#include <stdint.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
}
#ifdef NDEBUG
-@@ -62,6 +66,7 @@
+@@ -62,6 +64,7 @@
AVFrame * picture;
int64_t picture_pts;
AVFrame rgb_picture;
@@ -23,7 +21,7 @@
IplImage frame;
} CvCaptureAVI_FFMPEG;
-@@ -89,6 +94,12 @@
+@@ -89,6 +92,12 @@
capture->ic = NULL;
}
@@ -36,7 +34,7 @@
if( capture->rgb_picture.data[0] )
cvFree( &capture->rgb_picture.data[0] );
-@@ -104,6 +115,7 @@
+@@ -104,6 +113,7 @@
capture->ic = NULL;
capture->video_stream = -1;
capture->video_st = NULL;
@@ -44,7 +42,7 @@
/* register all codecs, demux and protocols */
av_register_all();
-@@ -145,6 +157,16 @@
+@@ -145,6 +155,16 @@
enc->height ), 8, 3, 0, 4 );
cvSetData( &capture->frame, capture->rgb_picture.data[0],
capture->rgb_picture.linesize[0] );
@@ -61,7 +59,7 @@
break;
}
}
-@@ -212,21 +234,12 @@
+@@ -212,21 +232,12 @@
static const IplImage* icvRetrieveFrameAVI_FFMPEG( CvCaptureAVI_FFMPEG* capture )
{
@@ -88,7 +86,7 @@
return &capture->frame;
}
-@@ -373,6 +386,7 @@
+@@ -373,6 +384,7 @@
AVFrame * picture;
AVFrame * rgb_picture;
uint8_t * picbuf;
@@ -96,7 +94,7 @@
AVStream * video_st;
} CvAVI_FFMPEG_Writer;
-@@ -389,6 +403,7 @@
+@@ -389,6 +401,7 @@
picture = avcodec_alloc_frame();
if (!picture)
return NULL;
@@ -104,7 +102,7 @@
size = avpicture_get_size(pix_fmt, width, height);
if(alloc){
picture_buf = (uint8_t *) cvAlloc(size);
-@@ -530,7 +545,7 @@
+@@ -530,7 +543,7 @@
}
// alloc memory for context
@@ -113,7 +111,7 @@
assert (writer->oc);
/* set file name */
-@@ -590,6 +605,7 @@
+@@ -590,6 +603,7 @@
bool need_color_convert;
need_color_convert = c->pix_fmt != PIX_FMT_BGR24;
@@ -121,7 +119,7 @@
/* allocate the encoded raw picture */
writer->picture = icv_alloc_picture_FFMPEG(c->pix_fmt, c->width, c->height, need_color_convert);
if (!writer->picture) {
-@@ -713,10 +729,23 @@
+@@ -713,10 +727,23 @@
PIX_FMT_BGR24, image->width, image->height);
// convert to the color format needed by the codec
@@ -149,7 +147,7 @@
}
}
else{
-@@ -738,7 +767,7 @@
+@@ -738,7 +765,7 @@
// nothing to do if already released
if ( !(*writer) )
return;
@@ -158,7 +156,7 @@
// release data structures in reverse order
CvAVI_FFMPEG_Writer * mywriter = (CvAVI_FFMPEG_Writer*)(*writer);
-@@ -759,7 +788,7 @@
+@@ -759,7 +786,7 @@
cvFree(&(mywriter->picture->data[0]));
}
av_free(mywriter->picture);
only in patch2:
unchanged:
--- opencv-1.0.0.orig/.pc/.version
+++ opencv-1.0.0/.pc/.version
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- opencv-1.0.0.orig/debian/patches/500_ftbfs_gcc44.diff
+++ opencv-1.0.0/debian/patches/500_ftbfs_gcc44.diff
@@ -0,0 +1,13 @@
+Index: opencv-1.0.0/cxcore/include/cxmisc.h
+===================================================================
+--- opencv-1.0.0.orig/cxcore/include/cxmisc.h 2009-11-14 17:03:05.000000000 +0100
++++ opencv-1.0.0/cxcore/include/cxmisc.h 2009-11-14 17:03:21.000000000 +0100
+@@ -130,7 +130,7 @@
+ #include <alloca.h>
+ #elif defined HAVE_ALLOCA
+ #include <stdlib.h>
+-#else
++#elif
+ #error
+ #endif
+
only in patch2:
unchanged:
--- opencv-1.0.0.orig/debian/patches/420_typedef_longint.diff
+++ opencv-1.0.0/debian/patches/420_typedef_longint.diff
@@ -0,0 +1,27 @@
+Index: opencv-1.0.0/cxcore/include/cxtypes.h
+===================================================================
+--- opencv-1.0.0.orig/cxcore/include/cxtypes.h 2009-11-13 16:12:26.000000000 +0100
++++ opencv-1.0.0/cxcore/include/cxtypes.h 2009-11-13 16:15:45.000000000 +0100
+@@ -52,6 +52,11 @@
+ #include <string.h>
+ #include <float.h>
+
++#if !defined _MSC_VER && !defined __BORLANDC__
++ #define __STDC_CONSTANT_MACROS // avformat needs INT64_C from stdint which needs this, avformat is included in otherlibs/highgui/cvcap_ffmpeg.cpp
++ #include <stdint.h>
++#endif
++
+ #if defined __ICL
+ #define CV_ICC __ICL
+ #elif defined __ICC
+@@ -141,8 +146,8 @@
+ typedef __int64 int64;
+ typedef unsigned __int64 uint64;
+ #else
+-typedef long long int64;
+-typedef unsigned long long uint64;
++typedef int64_t int64;
++typedef uint64_t uint64;
+ #endif
+
+ #ifndef HAVE_IPL
only in patch2:
unchanged:
--- opencv-1.0.0.orig/debian/patches/430_highgui_jpeg_camera.diff
+++ opencv-1.0.0/debian/patches/430_highgui_jpeg_camera.diff
@@ -0,0 +1,14 @@
+Index: opencv-1.0.0/otherlibs/highgui/cvcap_v4l.cpp
+===================================================================
+--- opencv-1.0.0.orig/otherlibs/highgui/cvcap_v4l.cpp 2009-11-14 17:13:46.000000000 +0100
++++ opencv-1.0.0/otherlibs/highgui/cvcap_v4l.cpp 2009-11-14 17:14:34.000000000 +0100
+@@ -544,7 +544,8 @@
+ /* support for MJPEG is only available with libjpeg and gcc,
+ because it's use libjepg and fmemopen()
+ */
+- if (try_palette_v4l2(capture, V4L2_PIX_FMT_MJPEG) == 0)
++ if (try_palette_v4l2(capture, V4L2_PIX_FMT_MJPEG) == 0 ||
++ try_palette_v4l2(capture, V4L2_PIX_FMT_JPEG) == 0)
+ {
+ PALETTE_MJPEG = 1;
+ }
only in patch2:
unchanged:
--- opencv-1.0.0.orig/cxcore/include/cxmisc.h
+++ opencv-1.0.0/cxcore/include/cxmisc.h
@@ -130,7 +130,7 @@
#include <alloca.h>
#elif defined HAVE_ALLOCA
#include <stdlib.h>
-#elif
+#else
#error
#endif
