[SCM] qt-gstreamer packaging branch, kubuntu_unstable, updated. debian/1.2.0-2-5-ga09d952

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b296ebc9ff1e3f21ea52eacc8e6951f0e5118f03
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Aug 7 21:48:34 2015 +0200

    Fix FTBFS with latest gstreamer.
---
 debian/changelog                            |  8 ++++++++
 debian/control                              |  1 +
 debian/patches/find_gstconfig_properly.diff | 29 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 4 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eaa71f0..2be6c99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qt-gstreamer (1.2.0-2ubuntu1) UNRELEASED; urgency=medium
+
+  * Fix FTBFS because of latest gstreamer:
+    - add find_gstconfig_properly.diff
+    - add pkg-config to build depends (needed by the above patch)
+
+ -- José Manuel Santamaría Lema <panfaust at gmail.com>  Fri, 07 Aug 2015 21:47:07 +0200
+
 qt-gstreamer (1.2.0-2) unstable; urgency=medium
 
   * Add disable-doxygen-timestamp.patch to help make package
diff --git a/debian/control b/debian/control
index c82c3cc..235d007 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: cmake (>= 2.8.6),
                libqt4-dev (>= 4:4.8.1),
                libqt4-opengl-dev (>= 4:4.8.1),
                libqt5opengl5-dev,
+               pkg-config,
                pkg-kde-tools (>= 0.12),
                qtbase5-dev,
                qtdeclarative5-dev
diff --git a/debian/patches/find_gstconfig_properly.diff b/debian/patches/find_gstconfig_properly.diff
new file mode 100644
index 0000000..7371a93
--- /dev/null
+++ b/debian/patches/find_gstconfig_properly.diff
@@ -0,0 +1,29 @@
+Description: apply gstreamer pkg-config definitions
+ To ensure gstreamer builds correctly, pick up its cflags in FindGstreamer
+ and apply them to the build as definitions
+Author: José Manuel Santamaría <panfaust at gmail.com>
+Origin: vendor, https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html
+Forwarded: https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html
+Reviewed-by: Harald Sitter <sitter at kde.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/cmake/modules/FindGStreamer.cmake
++++ b/cmake/modules/FindGStreamer.cmake
+@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND)
+     exec_program(${PKG_CONFIG_EXECUTABLE}
+                  ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION}
+                  OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR)
++    set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
+ endif()
+ 
+ find_library(GSTREAMER_LIBRARY
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,6 +106,7 @@ find_package(GObject)
+ macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE)
+ 
+ set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES})
++add_definitions(${GSTREAMER_DEFINITIONS})
+ include(CheckCXXSourceCompiles)
+ check_cxx_source_compiles("
+ #include <QtCore/QtGlobal>
diff --git a/debian/patches/series b/debian/patches/series
index 8adc3db..f01d05c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable-doxygen-timestamp.patch
+find_gstconfig_properly.diff

-- 
qt-gstreamer packaging