New upstream development snapshot.

9 files changed, 160 insertions, 16 deletions

diff --git a/debian/build-deps b/debian/build-deps
index c4e11eb0..ed99909c 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -1,6 +1,6 @@
 @GST_LIB_DEV_DEP@
 @GST_EXTRA_BUILD_DEPENDS@
-libgstreamer-plugins-base@GST_ABI@-dev (>= 1.0.0)
+libgstreamer-plugins-base@GST_ABI@-dev (>= 1.1.2)
 autotools-dev
 dh-autoreconf
 automake (>= 1.11)
@@ -13,7 +13,7 @@ dpkg-dev (>= 1.15.1)
 pkg-config (>= 0.11.0)
 gtk-doc-tools (>= 1.12)
 libglib2.0-dev (>= 2.32)
-liborc-0.4-dev (>= 1:0.4.16)
+liborc-0.4-dev (>= 1:0.4.17)
 libcairo2-dev (>= 1.10.0)
 libcaca-dev
 libspeex-dev (>= 1.1.6)
@@ -31,10 +31,10 @@ libgtk-3-dev
 libtag1-dev (>= 1.5)
 libwavpack-dev (>= 4.20)
 gstreamer@GST_ABI@-plugins-base (>= 1.0.0)
-libsoup-gnome2.4-dev (>= 2.26.1)
-libpulse-dev (>= 1.0)
+libsoup2.4-dev (>= 2.26.1)
+libpulse-dev (>= 2.0)
 libbz2-dev
 gstreamer@GST_ABI@-doc
 gstreamer@GST_ABI@-plugins-base-doc
-libjack-dev (>= 1:0.99.10)
+libjack-jackd2-dev
 libvpx-dev (>= 1.1.0)
diff --git a/debian/build-deps.in b/debian/build-deps.in
index c4e11eb0..ed99909c 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.0.0)
+libgstreamer-plugins-base@GST_ABI@-dev (>= 1.1.2)
 autotools-dev
 dh-autoreconf
 automake (>= 1.11)
@@ -13,7 +13,7 @@ dpkg-dev (>= 1.15.1)
 pkg-config (>= 0.11.0)
 gtk-doc-tools (>= 1.12)
 libglib2.0-dev (>= 2.32)
-liborc-0.4-dev (>= 1:0.4.16)
+liborc-0.4-dev (>= 1:0.4.17)
 libcairo2-dev (>= 1.10.0)
 libcaca-dev
 libspeex-dev (>= 1.1.6)
@@ -31,10 +31,10 @@ libgtk-3-dev
 libtag1-dev (>= 1.5)
 libwavpack-dev (>= 4.20)
 gstreamer@GST_ABI@-plugins-base (>= 1.0.0)
-libsoup-gnome2.4-dev (>= 2.26.1)
-libpulse-dev (>= 1.0)
+libsoup2.4-dev (>= 2.26.1)
+libpulse-dev (>= 2.0)
 libbz2-dev
 gstreamer@GST_ABI@-doc
 gstreamer@GST_ABI@-plugins-base-doc
-libjack-dev (>= 1:0.99.10)
+libjack-jackd2-dev
 libvpx-dev (>= 1.1.0)
diff --git a/debian/changelog b/debian/changelog
index 586ba446..ed3d9a76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+gst-plugins-good1.0 (1.1.2-1) experimental; urgency=low
+
+  * New upstream development snapshot:
+    + debian/rules,
+      debian/build-deps.in:
+      - Build depend on GStreamer and gst-plugins-base >= 1.1.2.
+      - Build depend on orc >= 0.4.17.
+      - Build depend on pulseaudio >= 2.0.
+      - Build depend on libsoup2.4-dev instead of libsoup-gnome2.4-dev.
+      - Build depend on libjack-jackd2-dev instead of libjack-dev.
+    + debian/gstreamer-plugins-good.install,
+      debian/control.in:
+      - Add dtmf plugin which moved from gst-plugins-bad.
+      - Add newly ported cairo plugin.
+  * debian/patches/0001-souphttpsrc-ignore-errors-from-HEAD-request.patch:
+    + Patch from upstream GIT to ignore errors that happened as a result
+      of the HEAD request. Only error out later if the GET request fails.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sun, 14 Jul 2013 11:46:14 +0200
+
 gst-plugins-good1.0 (1.0.8-1) unstable; urgency=low
 
   * New upstream bugfix release.
diff --git a/debian/control b/debian/control
index b17600c2..260336ee 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Maintainers of GStreamer packages <pkg-gstreamer-maintainers@lists.a
 Uploaders: Loic Minier <lool@dooz.org>,
            Sebastian Dröge <slomo@debian.org>,
            Sjoerd Simons <sjoerd@debian.org>
-Build-Depends: libgstreamer1.0-dev (>= 1.0.0),  libraw1394-dev (>= 2.0.0) [linux-any] , libiec61883-dev (>= 1.0.0) [linux-any] , libavc1394-dev [linux-any] , libv4l-dev [linux-any] , libgudev-1.0-dev (>= 143) [linux-any], libgstreamer-plugins-base1.0-dev (>= 1.0.0), autotools-dev, dh-autoreconf, automake (>= 1.11), autoconf (>= 2.62), libtool (>= 2.2.6), autopoint (>= 0.17), cdbs (>= 0.4.93), debhelper (>= 9), dpkg-dev (>= 1.15.1), pkg-config (>= 0.11.0), gtk-doc-tools (>= 1.12), libglib2.0-dev (>= 2.32), liborc-0.4-dev (>= 1:0.4.16), libcairo2-dev (>= 1.10.0), libcaca-dev, libspeex-dev (>= 1.1.6), libpng-dev, libshout3-dev, libjpeg-dev, libaa1-dev (>= 1.4p5), libflac-dev (>= 1.1.4), libdv4-dev | libdv-dev, libxdamage-dev, libxext-dev, libxfixes-dev, libxv-dev, libgtk-3-dev, libtag1-dev (>= 1.5), libwavpack-dev (>= 4.20), gstreamer1.0-plugins-base (>= 1.0.0), libsoup-gnome2.4-dev (>= 2.26.1), libpulse-dev (>= 1.0), libbz2-dev, gstreamer1.0-doc, gstreamer1.0-plugins-base-doc, libjack-dev (>= 1:0.99.10), libvpx-dev (>= 1.1.0)
+Build-Depends: libgstreamer1.0-dev (>= 1.1.2),  libraw1394-dev (>= 2.0.0) [linux-any] , libiec61883-dev (>= 1.0.0) [linux-any] , libavc1394-dev [linux-any] , libv4l-dev [linux-any] , libgudev-1.0-dev (>= 143) [linux-any], libgstreamer-plugins-base1.0-dev (>= 1.1.2), autotools-dev, dh-autoreconf, automake (>= 1.11), autoconf (>= 2.62), libtool (>= 2.2.6), autopoint (>= 0.17), cdbs (>= 0.4.93), debhelper (>= 9), dpkg-dev (>= 1.15.1), pkg-config (>= 0.11.0), gtk-doc-tools (>= 1.12), libglib2.0-dev (>= 2.32), liborc-0.4-dev (>= 1:0.4.17), libcairo2-dev (>= 1.10.0), libcaca-dev, libspeex-dev (>= 1.1.6), libpng-dev, libshout3-dev, libjpeg-dev, libaa1-dev (>= 1.4p5), libflac-dev (>= 1.1.4), libdv4-dev | libdv-dev, libxdamage-dev, libxext-dev, libxfixes-dev, libxv-dev, libgtk-3-dev, libtag1-dev (>= 1.5), libwavpack-dev (>= 4.20), gstreamer1.0-plugins-base (>= 1.0.0), libsoup2.4-dev (>= 2.26.1), libpulse-dev (>= 2.0), libbz2-dev, gstreamer1.0-doc, gstreamer1.0-plugins-base-doc, libjack-jackd2-dev, libvpx-dev (>= 1.1.0)
 Standards-Version: 3.9.3
 
 Package: gstreamer1.0-plugins-good-doc
@@ -58,7 +58,8 @@ Depends: ${misc:Depends},
          gstreamer1.0-pulseaudio | gstreamer1.0-audiosink,
          gstreamer1.0-plugins-base,
 Recommends: gstreamer1.0-x
-Conflicts: gstreamer1.0-plugins-bad (<< 0.11.99)
+Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
+Conflicts: gstreamer1.0-plugins-bad (<< 1.1.2)
 XB-GStreamer-Version: ${gstreamer:Version}
 XB-GStreamer-Elements: ${gstreamer:Elements}
 XB-GStreamer-URI-Sources: ${gstreamer:URISources}
@@ -85,7 +86,8 @@ Priority: extra
 Depends: gstreamer1.0-plugins-good (= ${binary:Version}),
          gstreamer1.0-pulseaudio (= ${binary:Version}),
          ${misc:Depends}
-Conflicts: gstreamer1.0-plugins-bad-dbg (<< 0.11.99)
+Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
+Conflicts: gstreamer1.0-plugins-bad (<< 1.1.2)
 Description: GStreamer plugins from the "good" set
  GStreamer is a streaming media framework, based on graphs of filters
  which operate on media data.  Applications using this library can do
diff --git a/debian/control.in b/debian/control.in
index bd4f262f..dc6d36bf 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -58,7 +58,8 @@ Depends: ${misc:Depends},
          @GST_PKGNAME@-pulseaudio | @GST_PKGNAME@-audiosink,
          gstreamer@GST_ABI@-plugins-base,
 Recommends: @GST_PKGNAME@-x
-Conflicts: gstreamer1.0-plugins-bad (<< 0.11.99)
+Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
+Conflicts: gstreamer1.0-plugins-bad (<< 1.1.2)
 XB-GStreamer-Version: ${gstreamer:Version}
 XB-GStreamer-Elements: ${gstreamer:Elements}
 XB-GStreamer-URI-Sources: ${gstreamer:URISources}
@@ -85,7 +86,8 @@ Priority: extra
 Depends: @GST_PKGNAME@-plugins-good (= ${binary:Version}),
          @GST_PKGNAME@-pulseaudio (= ${binary:Version}),
          ${misc:Depends}
-Conflicts: gstreamer1.0-plugins-bad-dbg (<< 0.11.99)
+Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
+Conflicts: gstreamer1.0-plugins-bad (<< 1.1.2)
 Description: GStreamer plugins from the "good" set
  GStreamer is a streaming media framework, based on graphs of filters
  which operate on media data.  Applications using this library can do
diff --git a/debian/gstreamer-plugins-good.install b/debian/gstreamer-plugins-good.install
index 49c150a5..047470cd 100644
--- a/debian/gstreamer-plugins-good.install
+++ b/debian/gstreamer-plugins-good.install
@@ -11,9 +11,11 @@ debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstauparse.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstautodetect.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstavi.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstcacasink.so
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstcairo.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstcutter.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstdebug.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstdeinterlace.so
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstdtmf.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstdv.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgsteffectv.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstequalizer.so
diff --git a/debian/patches/0001-souphttpsrc-ignore-errors-from-HEAD-request.patch b/debian/patches/0001-souphttpsrc-ignore-errors-from-HEAD-request.patch
new file mode 100644
index 00000000..f3b8273e
--- /dev/null
+++ b/debian/patches/0001-souphttpsrc-ignore-errors-from-HEAD-request.patch
@@ -0,0 +1,117 @@
+From 9a7321872f6902dd829599aab02f193eec307ac7 Mon Sep 17 00:00:00 2001
+From: Thiago Santos <thiago.sousa.santos@collabora.com>
+Date: Thu, 11 Jul 2013 20:41:23 -0300
+Subject: [PATCH 1/2] souphttpsrc: ignore errors from HEAD request
+
+HEAD requests are used to check the server headers to see if it
+seekable. Ignore errors from those requests as they shouldn't be
+critical.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=704053
+---
+ ext/soup/gstsouphttpsrc.c | 82 ++++++++++++++++++++++++++---------------------
+ 1 file changed, 46 insertions(+), 36 deletions(-)
+
+diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c
+index 79f6109..b7f6de0 100644
+--- a/ext/soup/gstsouphttpsrc.c
++++ b/ext/soup/gstsouphttpsrc.c
+@@ -937,10 +937,15 @@ gst_soup_http_src_finished_cb (SoupMessage * msg, GstSoupHTTPSrc * src)
+     src->ret = GST_FLOW_CUSTOM_ERROR;
+   } else if (G_UNLIKELY (src->session_io_status !=
+           GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
+-    /* FIXME: reason_phrase is not translated, add proper error message */
+-    GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
+-        ("%s", msg->reason_phrase),
+-        ("libsoup status code %d", msg->status_code));
++    if (msg->method == SOUP_METHOD_HEAD) {
++      GST_DEBUG_OBJECT (src, "Ignoring error %d:%s during HEAD request",
++          msg->status_code, msg->reason_phrase);
++    } else {
++      /* FIXME: reason_phrase is not translated, add proper error message */
++      GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
++          ("%s", msg->reason_phrase),
++          ("libsoup status code %d", msg->status_code));
++    }
+   }
+   if (src->loop)
+     g_main_loop_quit (src->loop);
+@@ -1112,38 +1117,43 @@ static void
+ gst_soup_http_src_parse_status (SoupMessage * msg, GstSoupHTTPSrc * src)
+ {
+   if (SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code)) {
+-    switch (msg->status_code) {
+-      case SOUP_STATUS_CANT_RESOLVE:
+-      case SOUP_STATUS_CANT_RESOLVE_PROXY:
+-        SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, NOT_FOUND,
+-            _("Could not resolve server name."));
+-        src->ret = GST_FLOW_ERROR;
+-        break;
+-      case SOUP_STATUS_CANT_CONNECT:
+-      case SOUP_STATUS_CANT_CONNECT_PROXY:
+-        SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, OPEN_READ,
+-            _("Could not establish connection to server."));
+-        src->ret = GST_FLOW_ERROR;
+-        break;
+-      case SOUP_STATUS_SSL_FAILED:
+-        SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, OPEN_READ,
+-            _("Secure connection setup failed."));
+-        src->ret = GST_FLOW_ERROR;
+-        break;
+-      case SOUP_STATUS_IO_ERROR:
+-        SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, READ,
+-            _("A network error occured, or the server closed the connection "
+-                "unexpectedly."));
+-        src->ret = GST_FLOW_ERROR;
+-        break;
+-      case SOUP_STATUS_MALFORMED:
+-        SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, READ,
+-            _("Server sent bad data."));
+-        src->ret = GST_FLOW_ERROR;
+-        break;
+-      case SOUP_STATUS_CANCELLED:
+-        /* No error message when interrupted by program. */
+-        break;
++    if (msg->method == SOUP_METHOD_HEAD) {
++      GST_DEBUG_OBJECT (src, "Ignoring error %d during HEAD request",
++          msg->status_code);
++    } else {
++      switch (msg->status_code) {
++        case SOUP_STATUS_CANT_RESOLVE:
++        case SOUP_STATUS_CANT_RESOLVE_PROXY:
++          SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, NOT_FOUND,
++              _("Could not resolve server name."));
++          src->ret = GST_FLOW_ERROR;
++          break;
++        case SOUP_STATUS_CANT_CONNECT:
++        case SOUP_STATUS_CANT_CONNECT_PROXY:
++          SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, OPEN_READ,
++              _("Could not establish connection to server."));
++          src->ret = GST_FLOW_ERROR;
++          break;
++        case SOUP_STATUS_SSL_FAILED:
++          SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, OPEN_READ,
++              _("Secure connection setup failed."));
++          src->ret = GST_FLOW_ERROR;
++          break;
++        case SOUP_STATUS_IO_ERROR:
++          SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, READ,
++              _("A network error occured, or the server closed the connection "
++                  "unexpectedly."));
++          src->ret = GST_FLOW_ERROR;
++          break;
++        case SOUP_STATUS_MALFORMED:
++          SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, READ,
++              _("Server sent bad data."));
++          src->ret = GST_FLOW_ERROR;
++          break;
++        case SOUP_STATUS_CANCELLED:
++          /* No error message when interrupted by program. */
++          break;
++      }
+     }
+   } else if (SOUP_STATUS_IS_CLIENT_ERROR (msg->status_code) ||
+       SOUP_STATUS_IS_REDIRECTION (msg->status_code) ||
+-- 
+1.8.3.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 2497acb7..2cc0f6dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+0001-souphttpsrc-ignore-errors-from-HEAD-request.patch
 99_ltmain_as-needed.patch
diff --git a/debian/rules b/debian/rules
index eb5fc9e6..758e1cd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ gst_abi=$(gst_major).$(gst_minor)
 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.0.0)
+gst_lib_dev_dep=$(gst_lib_dev) (>= 1.1.2)
 
 gst_pkgname=gstreamer$(gst_abi)
 gst_deb_abi=$(gst_abi)-0