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

[Gal Shalif]

Fix bug 756154 package fail to build because kernel of Ubuntu 11.04 Natty do not provide the obsolete linux/videodev.h file. See details at https://bugs.launchpad.net/ubuntu/+source/opencv/+bug/756154

[lp:~gal-fourier/ubuntu/natty/opencv/bug-756154]

18. By Gal Shalif on 2011-05-08

add a forgoten patch file

19. By Gal Shalif on 2011-05-08

add a forgoten patch file

[Martin Pitt (pitti)]

I don't think we should use this patch, but the upstream one which adds proper v4l2 support. Please see my bug comments.

Thanks!

review: Disapprove

[Gal Shalif (gal-fourier)]

Start testing a new patch that is derived from upstream version 2.2 changeset at https://code.ros.org/trac/opencv/changeset/5206 (thanks to Martin for pointing to the changeset).
It seem that a proper V4L2 support do require more V4L2-related changes (about 500+ lines of code) from upstream version 2.2 file
https://code.ros.org/trac/opencv/changeset/5206/branches/2.2/opencv/modules/highgui/src/cap_libv4l.cpp

[Gal Shalif (gal-fourier)]

Update with a rewrite of the patch that is now derived from upstream changeset https://code.ros.org/trac/opencv/changeset/5206 (see Martin's comment above).

Note: Large V4L2-related changes from upstream are NOT included within this bugfix. See also at:
 * Upstream (i.e. version 2.2 file) with the V4L2-related changes: https://code.ros.org/trac/opencv/changeset/5206/branches/2.2/opencv/modules/highgui/src/cap_libv4l.cpp
 * Affected file (i.e. version 2.1 used by Ubuntu 11.04 Natty): src/highgui/cvcap_libv4l.cpp

[lp:~gal-fourier/ubuntu/natty/opencv/bug-756154]

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)

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):

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)

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)

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-05-08 13:51:39 +0000
@@ -1,3 +1,11 @@
+opencv (2.1.0-3ubuntu2) natty; urgency=low
+
+  * 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
+
+ -- Gal Shalif (Work at Fourier Systems) <[e-mail]>  Sun, 08 May 2011 15:45:35 +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-05-08 13:51:39 +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],

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-12-14 14:34:19 +0000
+++ debian/patches/series	2011-05-08 13:51:39 +0000
@@ -6,3 +6,4 @@
 hurd.patch
 fix_minor_version_python.patch
 fix_stdint_gcc45.patch
+ubuntu11.04_no_videodev.h_include_file.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-05-08 13:51:39 +0000
@@ -0,0 +1,53 @@
+Author: Gal Shalif <[e-mail]>
+Debian BTS: N/A
+Bug-Ubuntu: https://launchpad.net/bugs/756154
+Description: Use libv4l1-videodev.h from package libv4l-dev if kernel do not provide the obsolete linux/videodev.h file (i.e. Ubuntu 11.04 Natty)
+Forwarded: yes/no/not-needed
+Reviewed-by: TBD
+Last-Update: 2011-05-08
+--- a/src/highgui/cvcap_libv4l.cpp	2010-04-06 04:24:44.000000000 +0300
++++ b/src/highgui/cvcap_libv4l.cpp	2011-05-06 05:56:06.781620436 +0300
+@@ -202,7 +202,7 @@
+ 
+ #include "_highgui.h"
+ 
+-#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2
++#if !defined WIN32 && defined HAVE_CAMV4L2
+ 
+ #define CLEAR(x) memset (&(x), 0, sizeof (x))
+ 
+@@ -219,7 +219,11 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ 
++#ifdef HAVE_CAMV4L
+ #include <linux/videodev.h>
++#else /* not HAVE_CAMV4L */
++#include <libv4l1-videodev.h> /* Ubuntu 11.04 Natty do not have linux/videodev.h */
++#endif /* not HAVE_CAMV4L */
+ #include <linux/videodev2.h>
+ 
+ #include <libv4l1.h>
+--- a/src/highgui/cvcap_v4l.cpp	2010-04-06 04:24:44.000000000 +0300
++++ b/src/highgui/cvcap_v4l.cpp	2011-05-06 07:31:08.735530066 +0300
+@@ -202,7 +202,7 @@
+ 
+ #include "_highgui.h"
+ 
+-#if !defined WIN32 && defined HAVE_CAMV4L
++#if !defined WIN32 && defined HAVE_CAMV4L2 /* Gal Shalif: HAVE_CAMV4L (include file <linux/videodev.h>) is not defined for Ubuntu 11.04 Natty */
+ 
+ #define CLEAR(x) memset (&(x), 0, sizeof (x))
+ 
+@@ -214,7 +214,11 @@
+ #include <sys/types.h>
+ #include <sys/mman.h>
+ 
++#ifdef HAVE_CAMV4L
+ #include <linux/videodev.h>
++#else
++#include <libv4l1-videodev.h> /* Gal Shalif: libv4l-videodev.h from libv4l-dev is a replacement for the obsolete linux/videodev.h */
++#endif
+ 
+ #include <string.h>
+ #include <stdlib.h>