New upstream release candidate.
diff --git a/debian/build-deps b/debian/build-deps
index 189cccb..0d450a7 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -15,7 +15,7 @@
@GST_EXTRA_BUILD_DEPENDS@
@GST_LIB_DEV_DEP@
gstreamer@GST_ABI@-doc
-gstreamer@GST_ABI@-plugins-base (>= 1.5.90)
+gstreamer@GST_ABI@-plugins-base (>= 1.5.91)
gstreamer@GST_ABI@-plugins-base-doc
gtk-doc-tools (>= 1.12)
ladspa-sdk
@@ -42,7 +42,7 @@
libgme-dev
libgnutls28-dev (>= 2.11.3)
libgsm1-dev
-libgstreamer-plugins-base@GST_ABI@-dev (>= 1.5.90)
+libgstreamer-plugins-base@GST_ABI@-dev (>= 1.5.91)
libgtk-3-dev (>= 3.15.0)
libiptcdata0-dev (>= 1.0.2)
libjasper-dev
@@ -55,6 +55,7 @@
libmpg123-dev (>= 1.13)
libofa0-dev (>= 0.9.3)
libopenal-dev (>= 1:1.14)
+libopencv-dev (>= 2.3.0)
libopenexr-dev
libopenjpeg-dev
libopus-dev (>= 0.9.4)
diff --git a/debian/build-deps.in b/debian/build-deps.in
index 0780384..becbe2b 100644
--- a/debian/build-deps.in
+++ b/debian/build-deps.in
@@ -1,6 +1,6 @@
@GST_LIB_DEV_DEP@
@GST_EXTRA_BUILD_DEPENDS@
-libgstreamer-plugins-base@GST_ABI@-dev (>= 1.5.90)
+libgstreamer-plugins-base@GST_ABI@-dev (>= 1.5.91)
autotools-dev
dh-autoreconf
automake (>= 1.14)
@@ -29,7 +29,7 @@
libexempi-dev
libiptcdata0-dev (>= 1.0.2)
libwildmidi-dev (>= 0.2.3)
-gstreamer@GST_ABI@-plugins-base (>= 1.5.90)
+gstreamer@GST_ABI@-plugins-base (>= 1.5.91)
libofa0-dev (>= 0.9.3)
libdvdnav-dev (>= 4.1.2) [!hurd-any]
libssl-dev
@@ -75,6 +75,7 @@
libbs2b-dev
libde265-dev
libx265-dev
+libopencv-dev (>= 2.3.0)
libgirepository1.0-dev (>= 0.9.12-4~)
gobject-introspection (>= 0.9.12-4~)
gir1.2-glib-2.0
diff --git a/debian/changelog b/debian/changelog
index e20b91a..980dbf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gst-plugins-bad1.0 (1.5.91-1) experimental; urgency=medium
+
+ * New upstream release candidate.
+
+ -- Sebastian Dröge <slomo@debian.org> Fri, 18 Sep 2015 19:39:16 +0200
+
gst-plugins-bad1.0 (1.5.90-1) experimental; urgency=medium
* New upstream release candidate.
diff --git a/debian/control b/debian/control
index 21e5661..a5dc321 100644
--- a/debian/control
+++ b/debian/control
@@ -26,9 +26,9 @@
libbluetooth-dev (>= 5) [linux-any],
libsbc-dev (>= 1.1) [linux-any],
libwayland-dev (>= 1.0) [linux-any],
- libgstreamer1.0-dev (>= 1.5.90),
+ libgstreamer1.0-dev (>= 1.5.91),
gstreamer1.0-doc,
- gstreamer1.0-plugins-base (>= 1.5.90),
+ gstreamer1.0-plugins-base (>= 1.5.91),
gstreamer1.0-plugins-base-doc,
gtk-doc-tools (>= 1.12),
ladspa-sdk,
@@ -55,7 +55,7 @@
libgme-dev,
libgnutls28-dev (>= 2.11.3),
libgsm1-dev,
- libgstreamer-plugins-base1.0-dev (>= 1.5.90),
+ libgstreamer-plugins-base1.0-dev (>= 1.5.91),
libgtk-3-dev (>= 3.15.0),
libiptcdata0-dev (>= 1.0.2),
libjasper-dev,
@@ -68,6 +68,7 @@
libmpg123-dev (>= 1.13),
libofa0-dev (>= 0.9.3),
libopenal-dev (>= 1:1.14),
+ libopencv-dev (>= 2.3.0),
libopenexr-dev,
libopenjpeg-dev,
libopus-dev (>= 0.9.4),
diff --git a/debian/gstreamer-plugins-bad.install b/debian/gstreamer-plugins-bad.install
index 4836ef2..e84df04 100644
--- a/debian/gstreamer-plugins-bad.install
+++ b/debian/gstreamer-plugins-bad.install
@@ -63,6 +63,7 @@
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmxf.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstofa.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstopenal.so
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstopencv.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstopengl.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstopenexr.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstopenjpeg.so
diff --git a/debian/patches/03_gtk-gl-Use-our-GL-function-table-instead-of-directly.patch b/debian/patches/03_gtk-gl-Use-our-GL-function-table-instead-of-directly.patch
deleted file mode 100644
index 99470f8..0000000
--- a/debian/patches/03_gtk-gl-Use-our-GL-function-table-instead-of-directly.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f722f047efa6eba2d793364f7031adadcf2efab7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Wed, 19 Aug 2015 13:52:21 +0300
-Subject: [PATCH] gtk/gl: Use our GL function table instead of directly calling
- GL functions
-
-Otherwise we would have to link the plugin to the GL libraries directly.
----
- ext/gtk/gtkgstglwidget.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/ext/gtk/gtkgstglwidget.c b/ext/gtk/gtkgstglwidget.c
-index cdce3aa..059fa87 100644
---- a/ext/gtk/gtkgstglwidget.c
-+++ b/ext/gtk/gtkgstglwidget.c
-@@ -202,10 +202,12 @@ _redraw_texture (GtkGstGLWidget * gst_widget, guint tex)
- }
-
- static inline void
--_draw_black (void)
-+_draw_black (GstGLContext * context)
- {
-- glClearColor (0.0, 0.0, 0.0, 0.0);
-- glClear (GL_COLOR_BUFFER_BIT);
-+ const GstGLFuncs *gl = context->gl_vtable;
-+
-+ gl->ClearColor (0.0, 0.0, 0.0, 0.0);
-+ gl->Clear (GL_COLOR_BUFFER_BIT);
- }
-
- static gboolean
-@@ -225,7 +228,7 @@ gtk_gst_gl_widget_render (GtkGLArea * widget, GdkGLContext * context)
- gtk_gst_gl_widget_init_redisplay (GTK_GST_GL_WIDGET (widget));
-
- if (!priv->initted || !base_widget->negotiated) {
-- _draw_black ();
-+ _draw_black (priv->other_context);
- goto done;
- }
-
-@@ -237,7 +240,7 @@ gtk_gst_gl_widget_render (GtkGLArea * widget, GdkGLContext * context)
-
- if (!gst_video_frame_map (&gl_frame, &base_widget->v_info, buffer,
- GST_MAP_READ | GST_MAP_GL)) {
-- _draw_black ();
-+ _draw_black (priv->other_context);
- goto done;
- }
-
---
-2.5.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 6d822b2..6d98219 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
01_fix-modplug-linking.patch
02_opencv-linking.patch
-03_gtk-gl-Use-our-GL-function-table-instead-of-directly.patch
diff --git a/debian/rules b/debian/rules
index e12780a..3d44146 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@
gst_lib=libgstreamer$(gst_abi)-0
gst_lib_dev=libgstreamer$(gst_abi)-dev
# what gstreamer version is needed
-gst_lib_dev_dep=$(gst_lib_dev) (>= 1.5.90)
+gst_lib_dev_dep=$(gst_lib_dev) (>= 1.5.91)
gst_pkgname=gstreamer$(gst_abi)
gst_deb_abi=$(gst_abi)-0