Merge lp:~gal-fourier/ubuntu/natty/opencv/bug-756154 into lp:ubuntu/natty/opencv

[Gal Shalif]

Ubuntu 11.10 Oneiric fix of compilation error of opencv-2.1.0 when compiled against the (new) ffmpeg package libav-0.7:

Fix changes as requested by reviewer Chris Coulson (community) at https://code.launchpad.net/~gal-fourier/ubuntu/natty/opencv/bug-756154/+merge/67179 :

Chris Coulson wrote on 2011-07-11

Hi,

Thanks for your work. I have a few comments though:

1) "unstable" isn't a valid target for Ubuntu. This should be targetted to "oneiric" instead.
2) You can collapse the 2 changelog entries in to 1, as 2.1.0-3ubuntu2 has never been uploaded
3) Please wrap changelog entries to around 80 characters. The current changelog entries trigger this lintian warning: http://lintian.debian.org/tags/debian-changelog-line-too-long.html
4) In cvcap_ffmpeg_fix_compile_against_libav0.7.patch, you use 2 different values when checking LIBAVFORMAT_BUILD. Is this deliberate? Eg, in these 2 hunks:

@@ -514,6 +514,24 @@
 }

+#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()
 {
     bool valid = false;
@@ -795,6 +813,17 @@
 #endif
 };

+#if LIBAVFORMAT_BUILD >= (53<<16 | 2<<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 | 2<<8 | 0) */
+
 static const char * icvFFMPEGErrStr(int err)
 {
     switch(err) {

Reply
review: Needs Fixing

[Chris Coulson (chrisccoulson)]

Hi,

Thanks for your work. I have a few comments though:

1) "unstable" isn't a valid target for Ubuntu. This should be targetted to "oneiric" instead.
2) You can collapse the 2 changelog entries in to 1, as 2.1.0-3ubuntu2 has never been uploaded
3) Please wrap changelog entries to around 80 characters. The current changelog entries trigger this lintian warning: http://lintian.debian.org/tags/debian-changelog-line-too-long.html
4) In cvcap_ffmpeg_fix_compile_against_libav0.7.patch, you use 2 different values when checking LIBAVFORMAT_BUILD. Is this deliberate? Eg, in these 2 hunks:

@@ -514,6 +514,24 @@
 }

+#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()
 {
     bool valid = false;
@@ -795,6 +813,17 @@
 #endif
 };

+#if LIBAVFORMAT_BUILD >= (53<<16 | 2<<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 | 2<<8 | 0) */
+
 static const char * icvFFMPEGErrStr(int err)
 {
     switch(err) {

review: Needs Fixing

[Gal Shalif (gal-fourier)]

Fixed review comments at: https://code.launchpad.net/~gal-fourier/ubuntu/natty/opencv/bug-756154/+merge/68171

[Daniel Holbach (dholbach)]

Thanks for your work on this. It seems that with https://launchpad.net/ubuntu/+source/opencv/2.1.0-7 in Oneiric this upload is not necessary any more, as all the bugs are fixed already. Thanks again!

[Daniel Holbach (dholbach)]

Hello Gal,

Am 18.08.2011 16:00, schrieb Gal Shalif:
> Thanks for the update.
>
>> ... with https://launchpad.net/ubuntu/+source/opencv/2.1.0-7 in
> Oneiric ...
> The upload above is mostly an integration of my patch :-)

Great work! :-)

Have a great day,
 Daniel

--
Ubuntu Global Jam: 2nd-4th September 2011
https://wiki.ubuntu.com/UbuntuGlobalJam

Unmerged revisions

23. By Gal Shalif on 2011-07-17

* Add patch ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch:
  + fix build error on Ubuntu 11.10 Oneiric (LP: #791527):
* Add cvcap_ffmpeg_fix_compile_against_libav0.7.patch:
  fix compilation errors when compiled against libav-0.7
  (as applicable for Ubuntu 11.10 Oneiric) (LP: 756154)
* Add patch ubuntu11.04_no_videodev.h_include_file.patch:
  fix build error on Ubuntu 11.04 Natty (LP: #756154):
  - Backport the upstream 2.2 changeset to void the use of the obsolete V4L1
    (i.e. do not use the obsolete linux/videodev.h)

22. By Gal Shalif on 2011-07-07

Add cvcap_ffmpeg_fix_compile_against_libav0.7.patch - fix compilation errors when compiled against libav-0.7 (as applicable for Ubuntu 11.10 Oneiric) (LP: 756154)

21. By Gal Shalif on 2011-06-21

Add patch ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch - fix build error on Ubuntu 11.10 Oneiric (LP: #791527):

20. By Gal Shalif on 2011-06-01

* Add patch ubuntu11.04_no_videodev.h_include_file.patch - fix build error on Ubuntu 11.04 Natty (LP: #756154):
  - Backport the upstream 2.2 changeset to void the use of the obsolete V4L1 (linux/videodev.h)

19. By Gal Shalif on 2011-05-08

add a forgoten patch file

18. By Gal Shalif on 2011-05-08

add a forgoten patch file

17. By Gal Shalif on 2011-05-08

* Use libv4l1-videodev.h (from libv4l-dev) as a replacement for the obsolete linux/videodev.h on Ubuntu 11.04
  - Add libv4l-dev to build dependencies
  - ubuntu11.04_no_videodev.h_include_file.patch: modify src/highgui/cvcap_libv4l.cpp, src/highgui/cvcap_v4l.cpp

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-14 14:34:19 +0000
+++ debian/changelog	2011-07-17 13:48:35 +0000
@@ -1,3 +1,17 @@
+opencv (2.1.0-3ubuntu2) oneiric; urgency=low
+
+  * Add patch ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch:
+    + fix build error on Ubuntu 11.10 Oneiric (LP: #791527):
+  * Add cvcap_ffmpeg_fix_compile_against_libav0.7.patch:
+    fix compilation errors when compiled against libav-0.7
+    (as applicable for Ubuntu 11.10 Oneiric) (LP: 756154)
+  * Add patch ubuntu11.04_no_videodev.h_include_file.patch:
+    fix build error on Ubuntu 11.04 Natty (LP: #756154):
+    - Backport the upstream 2.2 changeset to void the use of the obsolete V4L1
+      (i.e. do not use the obsolete linux/videodev.h)
+
+ -- Gal Shalif (Work at Fourier Systems) <[e-mail]>  Sun, 17 Jul 2011 11:00:00 +0300
+
 opencv (2.1.0-3ubuntu1) natty; urgency=low
 
   * Adjust hack to re-included stdint.h for GCC-4.5. LP: #685500.
 
=== modified file 'debian/control'
--- debian/control	2010-08-25 01:49:14 +0000
+++ debian/control	2011-07-17 13:48:35 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Scientific Computing Team <[e-mail]>
 Uploaders: Sam Hocevar (Debian packages) <[e-mail]>, Nobuhiro Iwamatsu <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), cmake,
- libavcodec-dev (>= 0.svn20080206), libavformat-dev, libswscale-dev, libgtk2.0-dev,
+ libavcodec-dev (>= 0.svn20080206), libavformat-dev, libswscale-dev, libgtk2.0-dev, libv4l-dev,
  libjasper-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev,
  libraw1394-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
  libdc1394-22-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
 
=== added file 'debian/patches/cvcap_ffmpeg_fix_compile_against_libav0.7.patch'
--- debian/patches/cvcap_ffmpeg_fix_compile_against_libav0.7.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/cvcap_ffmpeg_fix_compile_against_libav0.7.patch	2011-07-17 13:48:35 +0000
@@ -0,0 +1,120 @@
+Author: Gal Shalif <[e-mail]>
+Debian BTS: N/A
+Bug-Ubuntu: https://launchpad.net/bugs/756154
+Description: Fix opencv-2.1.0 compilation errors when copiled with libav-0.7 (a.k.a. ffmpeg 0.7) - as applicable for Ubuntu 11.10 Oneiric
+ Note: Ubuntu 11.04 Natty use libav-0.6.2 with:
+       #define LIBAVCODEC_VERSION_MAJOR 52
+       #define LIBAVUTIL_VERSION_MAJOR  50
+       #define LIBAVFORMAT_BUILD       (52<<16 | 64<<8 | 2)
+ Note: Ubuntu 11.10 Oneiric use libav-0.7 with:
+       #define LIBAVCODEC_VERSION_MAJOR 53 
+       #define LIBAVUTIL_VERSION_MAJOR  51
+       #define LIBAVFORMAT_BUILD       (53<<16 | 2<<8 | 0)
+--- a/src/highgui/cvcap_ffmpeg.cpp	2011-07-06 12:44:09.585566733 +0300
++++ b/src/highgui/cvcap_ffmpeg.cpp	2011-07-06 13:09:43.261010471 +0300
+@@ -464,7 +464,7 @@
+         AVCodecContext *enc = &ic->streams[i]->codec;
+ #endif
+ 
+-        if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
++        if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
+             AVCodec *codec = avcodec_find_decoder(enc->codec_id);
+             if (!codec ||
+             avcodec_open(enc, codec) < 0)
+@@ -514,6 +514,24 @@
+ }
+ 
+ 
++#if LIBAVFORMAT_BUILD >= (53<<16 | 2<<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 | 2<<8 | 0) */
++
+ bool CvCapture_FFMPEG::grabFrame()
+ {
+     bool valid = false;
+@@ -795,6 +813,17 @@
+ #endif
+ };
+ 
++#if LIBAVFORMAT_BUILD >= (53<<16 | 2<<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 | 2<<8 | 0) */
++
+ static const char * icvFFMPEGErrStr(int err)
+ {
+     switch(err) {
+@@ -891,7 +920,7 @@
+ #endif
+ 
+ #if LIBAVFORMAT_BUILD > 4621
+-	c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
++	c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
+ #else
+ 	c->codec_id = oc->oformat->video_codec;
+ #endif
+@@ -903,7 +932,7 @@
+     //if(codec_tag) c->codec_tag=codec_tag;
+ 	codec = avcodec_find_encoder(c->codec_id);
+ 
+-	c->codec_type = CODEC_TYPE_VIDEO;
++	c->codec_type = AVMEDIA_TYPE_VIDEO;
+ 
+ 	/* put sample parameters */
+ 	c->bit_rate = bitrate;
+@@ -990,7 +1019,7 @@
+         AVPacket pkt;
+         av_init_packet(&pkt);
+ 
+-        pkt.flags |= PKT_FLAG_KEY;
++        pkt.flags |= AV_PKT_FLAG_KEY;
+         pkt.stream_index= video_st->index;
+         pkt.data= (uint8_t *)picture;
+         pkt.size= sizeof(AVPicture);
+@@ -1010,7 +1039,7 @@
+ 			pkt.pts = c->coded_frame->pts;
+ #endif
+             if(c->coded_frame->key_frame)
+-                pkt.flags |= PKT_FLAG_KEY;
++                pkt.flags |= AV_PKT_FLAG_KEY;
+             pkt.stream_index= video_st->index;
+             pkt.data= outbuf;
+             pkt.size= out_size;
+@@ -1210,7 +1239,7 @@
+ 	av_register_all ();
+ 
+ 	/* auto detect the output format from the name and fourcc code. */
+-	fmt = guess_format(NULL, filename, NULL);
++	fmt = av_guess_format(NULL, filename, NULL);
+ 	if (!fmt)
+         return false;
+ 
+@@ -1233,7 +1262,7 @@
+ #endif
+ 
+     // alloc memory for context
+-	oc = av_alloc_format_context();
++	oc = avformat_alloc_context();
+ 	assert (oc);
+ 
+ 	/* set file name */
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-12-14 14:34:19 +0000
+++ debian/patches/series	2011-07-17 13:48:35 +0000
@@ -6,3 +6,7 @@
 hurd.patch
 fix_minor_version_python.patch
 fix_stdint_gcc45.patch
+ubuntu11.04_no_videodev.h_include_file.patch
+ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch
+cvcap_ffmpeg_fix_compile_against_libav0.7.patch
+
 
=== added file 'debian/patches/ubuntu11.04_no_videodev.h_include_file.patch'
--- debian/patches/ubuntu11.04_no_videodev.h_include_file.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu11.04_no_videodev.h_include_file.patch	2011-07-17 13:48:35 +0000
@@ -0,0 +1,56 @@
+Author: Gal Shalif <[e-mail]>
+Debian BTS: N/A
+Bug-Ubuntu: https://launchpad.net/bugs/756154
+Description: Disable the use of V4L1 (do not require the obsolete linux/videodev.h file) to fix link error for Ubuntu 11.04 Natty
+ Fix bug by a backport of upstream changeset 5206 from https://code.ros.org/trac/opencv/changeset/5206
+ Update src/highgui/cvcap_libv4l.cpp with V4L2 support from upstream https://code.ros.org/trac/opencv/changeset/5206/branches/2.2/opencv/modules/highgui/src/cap_libv4l.cpp
+Forwarded: yes/no/not-needed
+Reviewed-by: Martin Pitt <[e-mail]>
+Last-Update: 2011-05-31
+--- a/cvconfig.h.cmake	2010-04-06 04:24:37.000000000 +0300
++++ b/cvconfig.h.cmake	2011-05-31 10:44:35.090386901 +0300
+@@ -19,6 +19,9 @@
+ /* V4L2 capturing support */
+ #cmakedefine HAVE_CAMV4L2
+ 
++/* V4L/V4L2 capturing support via libv4l */
++#cmakedefine HAVE_LIBV4L
++
+ /* Carbon windowing environment */
+ #cmakedefine HAVE_CARBON
+ 
+--- a/src/highgui/cvcap.cpp	2011-05-31 10:42:11.615197876 +0300
++++ b/src/highgui/cvcap.cpp	2011-05-31 10:49:10.376986822 +0300
+@@ -161,7 +161,7 @@
+             if (capture)
+                 return capture;
+         #endif
+-        #if defined (HAVE_CAMV4L) || defined (HAVE_CAMV4L2)
++        #if defined HAVE_LIBV4L || (defined (HAVE_CAMV4L) && defined (HAVE_CAMV4L2))
+             capture = cvCreateCameraCapture_V4L (index);
+             if (capture)
+                 return capture;
+--- a/src/highgui/cvcap_libv4l.cpp	2010-04-06 04:24:44.000000000 +0300
++++ b/src/highgui/cvcap_libv4l.cpp	2011-05-31 18:21:36.397699498 +0300
+@@ -202,7 +202,7 @@
+ 
+ #include "_highgui.h"
+ 
+-#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2
++#if !defined WIN32 && defined HAVE_LIBV4L 
+ 
+ #define CLEAR(x) memset (&(x), 0, sizeof (x))
+ 
+@@ -219,8 +219,12 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ 
++#ifdef HAVE_CAMV4L
+ #include <linux/videodev.h>
++#endif
++#ifdef HAVE_CAMV4L2
+ #include <linux/videodev2.h>
++#endif
+ 
+ #include <libv4l1.h>
+ #include <libv4l2.h>
 
=== added file 'debian/patches/ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch'
--- debian/patches/ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch	2011-07-17 13:48:35 +0000
@@ -0,0 +1,20 @@
+Author: Gal Shalif <[e-mail]>
+Debian BTS: N/A
+Bug-Ubuntu: https://launchpad.net/bugs/791527
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624917
+Description: Add the missing definition of typedef ptrdiff_t
+ Fix bug that had first manifest with Ubuntu 11.10 Oneiric with gcc 4.6 - but is not required for the older Ubuntu 11.04 Natty with gcc 4.5)
+Forwarded: yes/no/not-needed
+Reviewed-by: TBD
+Last-Update: 2011-06-21
+--- a/include/opencv/cxcore.h	2010-04-06 04:24:40.000000000 +0300
++++ b/include/opencv/cxcore.h	2011-06-21 14:08:01.129192382 +0300
+@@ -44,6 +44,8 @@
+ #ifndef __OPENCV_CORE_H__
+ #define __OPENCV_CORE_H__
+ 
++#include <stddef.h> /* Fix Ubuntu bug # 791527 - see https://bugs.launchpad.net/ubuntu/+source/opencv/+bug/791527 */
++
+ #ifdef __IPL_H__
+ #define HAVE_IPL
+ #endif