Bug#651872: opencv: FTBFS on kfreebsd

2011-12-14 Thread Julien Cristau
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.0 +0100
 b/modules/highgui/src/cap_libv4l.cpp  2011-12-13 21:21:55.0 +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.0 
+0100
 b/modules/highgui/src/cap_v4l.cpp  2011-12-13 23:07:40.0 +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



Processed: Re: Bug#651872: opencv: FTBFS on kfreebsd

2011-12-14 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

 tags 651872 patch
Bug #651872 [src:opencv] opencv: FTBFS on kfreebsd
Added tag(s) patch.
 kthxbye
Stopping processing here.

Please contact me if you need assistance.
-- 
651872: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651872
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#651872: opencv: FTBFS on kfreebsd

2011-12-12 Thread Julien Cristau
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

 cd 
 /build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/obj-x86_64-kfreebsd-gnu/modules/highgui
   /usr/bin/c++   -Dopencv_highgui_EXPORTS -DHAVE_CVCONFIG_H -DHAVE_JPEG 
 -DHAVE_PNG -DHAVE_TIFF -DHAVE_JASPER -DHAVE_OPENEXR -DHIGHGUI_EXPORTS 
 -DCVAPI_EXPORTS -Wall -Wno-long-long -pthread -ffunction-sections  -g -O2 
 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security 
 -Werror=format-security  -fomit-frame-pointer -ffast-math -DNDEBUG  -fPIC 
 -I/usr/lib/pymodules/python2.7/numpy/core/include 
 -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/. 
 -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/obj-x86_64-kfreebsd-gnu
  -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/include 
 -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/include/opencv
  -I/usr/include/OpenEXR -I/usr/include/gtk-2.0 
 -I/usr/lib/x86_64-kfreebsd-gnu/gtk-2.0/include -I/usr/include/atk-1.0 
 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 
 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 
 -I/usr/lib/x86_64-kfreebsd-gnu/glib-2.0/include -I/usr/include/pixman-1 
 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/cairo 
 -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/modules/highgui/include
  
 -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/modules/highgui/../core/include
  
 -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/modules/highgui/../imgproc/include
  
 -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/modules/highgui/src
  
 -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/obj-x86_64-kfreebsd-gnu/modules/highgui
  
 -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/modules/highgui/test
  
 -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/modules/highgui/../ts/include
  
 -I/build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/modules/highgui/../highgui/include
 -D PYTHON_USE_NUMPY=1 -o CMakeFiles/opencv_highgui.dir/src/cap_v4l.o -c 
 /build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/modules/highgui/src/cap_v4l.cpp
 /build/buildd-opencv_2.3.1-1-kfreebsd-amd64-gSYw2u/opencv-2.3.1/modules/highgui/src/cap_v4l.cpp:221:54:
  fatal error: asm/types.h: No such file or directory

asm/types.h is a Linux header.

Cheers,
Julien


signature.asc
Description: Digital signature