[Pkg-gstreamer-commits] [gst-plugins-bad1.0] 03/03: Disable OpenCV plugin for now

[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 dc700746665ba3bd225542217205a4fb100ae874
Author: Sebastian Dröge <slomo at circular-chaos.org>
Date:   Tue Sep 10 12:08:50 2013 +0200

    Disable OpenCV plugin for now
---
 debian/changelog                         |    3 +++
 debian/gstreamer-plugins-bad.install     |    2 +-
 debian/patches/03_modplug-includes.patch |   29 +++++++++++++++++++++++++++++
 debian/rules                             |    1 +
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e5fc449..63ffdc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ gst-plugins-bad1.0 (1.1.4-3) experimental; urgency=low
       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.
+  * debian/gstreamer-plugins-bad.install:
+    + Disable OpenCV plugin again for now until the libraries
+      are --as-needed clean again.
 
  -- Sebastian Dröge <slomo at debian.org>  Tue, 10 Sep 2013 11:12:25 +0200
 
diff --git a/debian/gstreamer-plugins-bad.install b/debian/gstreamer-plugins-bad.install
index 491e428..a81de3a 100644
--- a/debian/gstreamer-plugins-bad.install
+++ b/debian/gstreamer-plugins-bad.install
@@ -54,7 +54,7 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmpg123.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmxf.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstofa.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstopenal.so
-debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstopencv.so
+#debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstopencv.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstopenjpeg.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstopus.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstpcapparse.so
diff --git a/debian/patches/03_modplug-includes.patch b/debian/patches/03_modplug-includes.patch
new file mode 100644
index 0000000..fdaed0c
--- /dev/null
+++ b/debian/patches/03_modplug-includes.patch
@@ -0,0 +1,29 @@
+From c1d20ea244baf2c87ac3a98e4bfa55c542d646f4 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain.lane at canonical.com>
+Date: Tue, 10 Sep 2013 08:48:32 +0000
+Subject: [PATCH] modplug: Specify directory when including stdafx.h
+
+modplug stopped exposing their directory in their pcfile, meaining
+consumers accessing the headers directly fail to build.
+
+http://sourceforge.net/p/modplug-xmms/git/ci/75e9b166982ed637b59ef7cbc1835a09f768923e/
+---
+ ext/modplug/gstmodplug.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/modplug/gstmodplug.cc b/ext/modplug/gstmodplug.cc
+index 47154cf..a968c4a 100644
+--- a/ext/modplug/gstmodplug.cc
++++ b/ext/modplug/gstmodplug.cc
+@@ -54,7 +54,7 @@
+ #define WORDS_BIGENDIAN 0
+ #endif
+ 
+-#include <stdafx.h>
++#include <libmodplug/stdafx.h>
+ #include <libmodplug/sndfile.h>
+ 
+ #include "gstmodplug.h"
+-- 
+1.8.3.2
+
diff --git a/debian/rules b/debian/rules
index a32f923..cad0bc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -194,6 +194,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
 	--with-package-name=$(GST_PACKAGE_NAME) \
 	--with-package-origin=$(GST_PACKAGE_ORIGIN) \
 	--disable-pvr \
+	--disable-opencv
 
 # only build the docs on arches which can
 ifeq (,$(findstring $(DEB_HOST_ARCH),m68k arm))

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