[SCM] qtbase packaging branch, experimental, updated. debian/5.4.2+dfsg-4-24-g3197c59

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=3197c59

The following commit has been merged in the experimental branch:
commit 3197c59e11db07989ead40b9ed2c6117502bf2b7
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Sun Jul 5 12:13:23 2015 +0000

    Build depend on GStreamer 1.0 and add a configure option for it
    
    Conflicts:
    	debian/changelog
    
    Cherry-pick Timo's commit to add GStreamer 1.0 support, seems to be a new
    configure option in this version.
---
 debian/changelog | 3 +++
 debian/control   | 2 ++
 debian/rules     | 1 +
 3 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a8fedbf..4ef0a3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ qtbase-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
   * Fix build on Hurd, by temporarly disabling waitid() in forkfd code;
     patch hurd-forkfd.diff.
 
+  [ Timo Jyrinki ]
+  * Build depend on GStreamer 1.0 and add a configure option for it.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Jun 2015 14:41:08 +0300
 
 qtbase-opensource-src (5.4.2+dfsg-4) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index d2faaaa..15c2050 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,8 @@ Build-Depends: debhelper (>= 9),
                libgles2-mesa-dev [linux-any] | libgles2-dev [linux-any],
                libglib2.0-dev,
                libglu1-mesa-dev | libglu-dev,
+               libgstreamer1.0-dev,
+               libgstreamer-plugins-base1.0-dev,
                libgtk2.0-dev,
                libharfbuzz-dev,
                libicu-dev,
diff --git a/debian/rules b/debian/rules
index 2ed9843..adc79c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,6 +136,7 @@ override_dh_auto_configure:
 	            -accessibility \
 	            -compile-examples \
 	            -no-directfb \
+	            -gstreamer 1.0 \
 	            $(extra_configure_opts) \
 	            $(cpu_opt)
 

-- 
qtbase packaging