[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.3.1-4

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Wed Sep 17 22:55:36 UTC 2014


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

The following commit has been merged in the experimental branch:
commit d4c1da808275cdb0be368eb6a16aa8caede378e3
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jun 14 13:00:58 2014 +0400

    Make gstreamer config test a bit stricter.
    
    … to make sure it does not pass on Hurd.
---
 debian/changelog                           |  2 ++
 debian/patches/series                      |  1 +
 debian/patches/strict_gstreamer_check.diff | 15 +++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 13cd93e..21d1e41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtmultimedia-opensource-src (5.3.0-3) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Minor fixes for debian/copyright.
+  * Make gstreamer config test a bit stricter, to make sure it does
+    not pass on Hurd.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Jun 2014 12:38:23 +0400
 
diff --git a/debian/patches/series b/debian/patches/series
index 1662367..e75d9e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 rpath_nonlinux.diff
+strict_gstreamer_check.diff
diff --git a/debian/patches/strict_gstreamer_check.diff b/debian/patches/strict_gstreamer_check.diff
new file mode 100644
index 0000000..5acfdaa
--- /dev/null
+++ b/debian/patches/strict_gstreamer_check.diff
@@ -0,0 +1,15 @@
+Description: make gstreamer config test a bit stricter
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Forwarded: no
+Last-Update: 2014-06-14
+
+--- a/config.tests/gstreamer/main.cpp
++++ b/config.tests/gstreamer/main.cpp
+@@ -42,6 +42,7 @@
+ #define GST_USE_UNSTABLE_API
+ 
+ #include <gst/gst.h>
++#include <linux/videodev2.h>
+ 
+ int main(int argc, char** argv)
+ {

-- 
qtmultimedia packaging



More information about the pkg-kde-commits mailing list