r44226 - /packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Wed Dec 21 04:59:08 2011
New Revision: 44226

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

Drop asm/types.h.
Does not need asm/types.h on linux and kfreebsd.


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

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=44226&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 Wed Dec 21 04:59:08 2011
@@ -1,24 +1,20 @@
---- a/modules/highgui/src/cap_libv4l.cpp	2011-12-17 14:47:55.000000000 +0900
-+++ b/modules/highgui/src/cap_libv4l.cpp	2011-12-17 15:01:48.000000000 +0900
-@@ -232,7 +232,9 @@
+--- 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>
-+#if defined(__linux__)
- #include <sys/types.h>
-+#endif
+-#include <sys/types.h>
  #include <sys/mman.h>
  #include <string.h>
  #include <stdlib.h>
---- a/modules/highgui/src/cap_v4l.cpp	2011-12-17 14:48:05.000000000 +0900
-+++ b/modules/highgui/src/cap_v4l.cpp	2011-12-17 15:01:39.000000000 +0900
-@@ -211,7 +211,9 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <sys/ioctl.h>
-+#if defined(__linux__)
- #include <sys/types.h>
-+#endif
- #include <sys/mman.h>
- 
- #include <linux/videodev.h>