[Pkg-gstreamer-commits] [gst-plugins-bad1.0] 02/03: Fix build with OpenCV 2.4.6.1

[Sebastian Dröge]

This is an automated email from the git hooks/post-receive script.

slomo pushed a commit to branch debian-experimental
in repository gst-plugins-bad1.0.

commit 2f4b30b95052692a73001a6410d3f98e2be4fa8a
Author: Sebastian Dröge <slomo at circular-chaos.org>
Date:   Tue Sep 10 11:39:16 2013 +0200

    Fix build with OpenCV 2.4.6.1
---
 debian/changelog                       |    2 ++
 debian/patches/04_opencv-2.4.6.1.patch |   25 +++++++++++++++++++++++++
 debian/patches/series                  |    1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 64394dc..e5fc449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ gst-plugins-bad1.0 (1.1.4-3) experimental; urgency=low
   * debian/patches/03_modplug-includes.patch:
     + Fix build with the new modplug version by including the
       modplug headers properly. Thanks to Iain Lane for the patch.
+  * debian/patches/04_opencv-2.4.6.1.patch:
+    + Fix build with OpenCV 2.4.6.1.
 
  -- Sebastian Dröge <slomo at debian.org>  Tue, 10 Sep 2013 11:12:25 +0200
 
diff --git a/debian/patches/04_opencv-2.4.6.1.patch b/debian/patches/04_opencv-2.4.6.1.patch
new file mode 100644
index 0000000..da7bb0f
--- /dev/null
+++ b/debian/patches/04_opencv-2.4.6.1.patch
@@ -0,0 +1,25 @@
+From c70fceb16fa71207b02f4a70c2b2524c7ee4ffa2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo at circular-chaos.org>
+Date: Tue, 10 Sep 2013 11:37:55 +0200
+Subject: [PATCH] opencv: We also work with OpenCV 2.4.6.1
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 580c6ef..1a77cc1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1743,7 +1743,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [
+   dnl a new version and the no-backward-compatibility define. (There doesn't
+   dnl seem to be a switch to suppress the warnings the cvcompat.h header
+   dnl causes.)
+-  PKG_CHECK_MODULES(OPENCV, opencv >= 2.0.0 opencv <= 2.4.5 , [
++  PKG_CHECK_MODULES(OPENCV, opencv >= 2.0.0 opencv <= 2.4.6.1 , [
+     AC_PROG_CXX
+     AC_LANG([C++])
+     OLD_CPPFLAGS=$CPPFLAGS
+-- 
+1.8.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 10c753b..93493e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 01_fix-modplug-linking.patch
 02_soundtouch-int.patch
 03_modplug-includes.patch
+04_opencv-2.4.6.1.patch
 99_ltmain_as-needed.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-plugins-bad1.0.git