r44217 - in /packages/opencv/trunk/debian/patches: 0013_drop_asm_types_h_kfreebsd.patch series

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Wed Dec 21 01:06:28 2011
New Revision: 44217

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44217
Log:
Fix build on kfreeBSD. (Closes: #651872)

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

Added: 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=44217&op=file
==============================================================================
--- packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch (added)
+++ packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch Wed Dec 21 01:06:28 2011
@@ -1,0 +1,24 @@
+--- 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 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#if defined(__linux__)
+ #include <sys/types.h>
++#endif
+ #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>

Modified: packages/opencv/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/series?rev=44217&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/series (original)
+++ packages/opencv/trunk/debian/patches/series Wed Dec 21 01:06:28 2011
@@ -2,3 +2,4 @@
 0007-typos-in-strings-docs.patch
 0011_optimize_i486.patch
 0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch
+0013_drop_asm_types_h_kfreebsd.patch