r44356 - in /packages/opencv/trunk/debian: changelog patches/0013_drop_asm_types_h_kfreebsd.patch

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Tue Jan 10 22:01:04 2012
New Revision: 44356

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44356
Log:
Update patches/0013_drop_asm_types_h_kfreebsd.patch.

Modified:
    packages/opencv/trunk/debian/changelog
    packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch

Modified: packages/opencv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/changelog?rev=44356&op=diff
==============================================================================
--- packages/opencv/trunk/debian/changelog (original)
+++ packages/opencv/trunk/debian/changelog Tue Jan 10 22:01:04 2012
@@ -1,3 +1,10 @@
+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.

Modified: packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch?rev=44356&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch (original)
+++ packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch Tue Jan 10 22:01:04 2012
@@ -1,20 +1,24 @@
---- a/modules/highgui/src/cap_v4l.cpp	2011-12-21 13:30:03.000000000 +0900
-+++ b/modules/highgui/src/cap_v4l.cpp	2011-12-21 13:30:29.000000000 +0900
-@@ -211,7 +211,6 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <sys/ioctl.h>
--#include <sys/types.h>
- #include <sys/mman.h>
- 
- #include <linux/videodev.h>
---- a/modules/highgui/src/cap_libv4l.cpp	2011-12-21 13:30:12.000000000 +0900
-+++ b/modules/highgui/src/cap_libv4l.cpp	2011-12-21 13:30:52.000000000 +0900
-@@ -232,7 +232,6 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
--#include <sys/types.h>
+--- 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>