tags 651872 patch kthxbye On Mon, Dec 12, 2011 at 20:15:54 +0100, Julien Cristau wrote:
> Source: opencv > Version: 2.3.1-1 > Severity: serious > > opencv fails to build on the kfreebsd-* buildds: > https://buildd.debian.org/status/package.php?p=opencv > Fixed with the patch below. On top of 2.3.1-0exp1 because apparently debian-science svn wasn't updated with 2.3.1-1. Index: debian/patches/0001-drop-useless-asm-types-h.patch =================================================================== --- debian/patches/0001-drop-useless-asm-types-h.patch (revision 0) +++ debian/patches/0001-drop-useless-asm-types-h.patch (revision 0) @@ -0,0 +1,27 @@ +From: Julien Cristau <jcris...@debian.org> +Date: Tue Dec 13 20:23:15 UTC 2011 +Subject: Drop useless <asm/types.h> include + +It's linux-specific, and unneeded there anyway. +Closes: #651872 + +--- a/modules/highgui/src/cap_libv4l.cpp.orig 2011-12-13 21:21:37.000000000 +0100 ++++ b/modules/highgui/src/cap_libv4l.cpp 2011-12-13 21:21:55.000000000 +0100 +@@ -236,7 +236,6 @@ + #include <sys/mman.h> + #include <string.h> + #include <stdlib.h> +-#include <asm/types.h> /* for videodev2.h */ + #include <assert.h> + #include <sys/stat.h> + #include <sys/ioctl.h> +--- a/modules/highgui/src/cap_v4l.cpp.orig 2011-12-13 23:08:01.000000000 +0100 ++++ b/modules/highgui/src/cap_v4l.cpp 2011-12-13 23:07:40.000000000 +0100 +@@ -218,7 +218,6 @@ + + #include <string.h> + #include <stdlib.h> +-#include <asm/types.h> /* for videodev2.h */ + #include <assert.h> + #include <sys/stat.h> + #include <sys/ioctl.h> Index: debian/patches/series =================================================================== --- debian/patches/series (revision 44150) +++ debian/patches/series (working copy) @@ -1,3 +1,4 @@ +0001-drop-useless-asm-types-h.patch 0005-build-static-libs.patch 0007-typos-in-strings-docs.patch 0011_optimize_i486.patch Index: debian/changelog =================================================================== --- debian/changelog (revision 44150) +++ debian/changelog (working copy) @@ -1,3 +1,10 @@ +opencv (2.3.1-0exp1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Drop useless <asm/types.h> include to fix FTBFS on kfreebsd. + + -- Julien Cristau <jcris...@debian.org> Tue, 13 Dec 2011 22:17:22 +0100 + opencv (2.3.1-0exp1) experimental; urgency=low * New upstream release. Cheers, Julien -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org