r44422 - in /packages/opencv/trunk/debian/patches: 0014_fix_ftbfs_libav0.8.patch series

iwamatsu at users.alioth.debian.org iwamatsu at users.alioth.debian.org
Thu Jan 26 23:29:53 UTC 2012


Author: iwamatsu
Date: Thu Jan 26 23:29:52 2012
New Revision: 44422

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44422
Log:
Fix FTBFS with libav 0.8. (Closes: #654220)

Add patches/0014_fix_ftbfs_libav0.8.patch.


Added:
    packages/opencv/trunk/debian/patches/0014_fix_ftbfs_libav0.8.patch
Modified:
    packages/opencv/trunk/debian/patches/series

Added: packages/opencv/trunk/debian/patches/0014_fix_ftbfs_libav0.8.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/0014_fix_ftbfs_libav0.8.patch?rev=44422&op=file
==============================================================================
--- packages/opencv/trunk/debian/patches/0014_fix_ftbfs_libav0.8.patch (added)
+++ packages/opencv/trunk/debian/patches/0014_fix_ftbfs_libav0.8.patch Thu Jan 26 23:29:52 2012
@@ -1,0 +1,18 @@
+Description: FTBFS with libav 0.8
+Forwarded: not yet
+Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Bug-Debian: http://bugs.debian.org/654220
+Last-Update: 2012-01-27
+
+diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp
+index 14ed8b7..f1e0fcb 100644
+--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
++++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
+@@ -108,6 +108,7 @@ extern "C" {
+ #if defined(HAVE_LIBSWSCALE_SWSCALE_H)
+   #include <libswscale/swscale.h>
+ #endif
++#include <libavutil/mathematics.h>
+ 
+ #endif
+ 

Modified: packages/opencv/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/series?rev=44422&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/series (original)
+++ packages/opencv/trunk/debian/patches/series Thu Jan 26 23:29:52 2012
@@ -3,3 +3,4 @@
 0011_optimize_i486.patch
 0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch
 0013_drop_asm_types_h_kfreebsd.patch
+0014_fix_ftbfs_libav0.8.patch




More information about the debian-science-commits mailing list